From 380a42af77abf8285b89208455a24d83abd22f20 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Mon, 6 Jan 2025 13:20:22 +0000 Subject: [PATCH 1/8] Fix pypi naming 1 moonstreamdb_v3 --- moonstreamdb-v3/moonstreamdbv3/version.txt | 2 +- moonstreamdb-v3/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/moonstreamdb-v3/moonstreamdbv3/version.txt b/moonstreamdb-v3/moonstreamdbv3/version.txt index d917d3e2..b1e80bb2 100644 --- a/moonstreamdb-v3/moonstreamdbv3/version.txt +++ b/moonstreamdb-v3/moonstreamdbv3/version.txt @@ -1 +1 @@ -0.1.2 +0.1.3 diff --git a/moonstreamdb-v3/setup.py b/moonstreamdb-v3/setup.py index 34e36f05..7b57de27 100644 --- a/moonstreamdb-v3/setup.py +++ b/moonstreamdb-v3/setup.py @@ -7,7 +7,7 @@ with open("README.md") as ifp: long_description = ifp.read() setup( - name="moonstreamdb-v3", + name="moonstreamdb_v3", version=VERSION, author="Bugout.dev", author_email="engineers@bugout.dev", From 619ad6c6ab36a43fdc8a895de1fa9e7ed9c63ce9 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Mon, 6 Jan 2025 13:51:33 +0000 Subject: [PATCH 2/8] Fix pypi naming 2 moonstream_types --- types/python/moonstreamtypes/version.txt | 2 +- types/python/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/types/python/moonstreamtypes/version.txt b/types/python/moonstreamtypes/version.txt index c5d54ec3..7c1886bb 100644 --- a/types/python/moonstreamtypes/version.txt +++ b/types/python/moonstreamtypes/version.txt @@ -1 +1 @@ -0.0.9 +0.0.10 diff --git a/types/python/setup.py b/types/python/setup.py index 8bfb5db7..045906bb 100644 --- a/types/python/setup.py +++ b/types/python/setup.py @@ -7,7 +7,7 @@ with open("README.md") as ifp: long_description = ifp.read() setup( - name="moonstream-types", + name="moonstream_types", version=VERSION, author="Moonstream.to", author_email="engineers@moonstream.to", @@ -34,7 +34,7 @@ setup( zip_safe=False, install_requires=[ "moonstreamdb>=0.4.5", - "moonstreamdb-v3>=0.1.2", + "moonstreamdb_v3>=0.1.3", ], extras_require={ "dev": ["black", "isort", "mypy"], From 6eeb02bf614f0cbf0d69795e43f39b1ec3e12e1f Mon Sep 17 00:00:00 2001 From: kompotkot Date: Tue, 7 Jan 2025 10:34:36 +0000 Subject: [PATCH 3/8] Release packages update --- .github/workflows/release.clients.python.yml | 2 +- .github/workflows/release.mooncrawl.yml | 2 +- .github/workflows/release.moonstreamapi.yml | 2 +- .github/workflows/release.moonstreamdb.yml | 2 +- .github/workflows/release.moonstreamdbv3.yml | 2 +- .github/workflows/release.types.python.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.clients.python.yml b/.github/workflows/release.clients.python.yml index d43b2e9d..dbb6e8b0 100644 --- a/.github/workflows/release.clients.python.yml +++ b/.github/workflows/release.clients.python.yml @@ -26,5 +26,5 @@ jobs: TWINE_USERNAME: "__token__" TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_MOONSTREAM }} run: | - python setup.py sdist bdist_wheel + python -m build twine upload dist/* diff --git a/.github/workflows/release.mooncrawl.yml b/.github/workflows/release.mooncrawl.yml index 0c9e9445..25574b7f 100644 --- a/.github/workflows/release.mooncrawl.yml +++ b/.github/workflows/release.mooncrawl.yml @@ -26,5 +26,5 @@ jobs: TWINE_USERNAME: "__token__" TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_MOONCRAWL }} run: | - python setup.py sdist bdist_wheel + python -m build twine upload dist/* diff --git a/.github/workflows/release.moonstreamapi.yml b/.github/workflows/release.moonstreamapi.yml index 3d5a5acd..870e8517 100644 --- a/.github/workflows/release.moonstreamapi.yml +++ b/.github/workflows/release.moonstreamapi.yml @@ -26,5 +26,5 @@ jobs: TWINE_USERNAME: "__token__" TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_MOONSTREAMAPI }} run: | - python setup.py sdist bdist_wheel + python -m build twine upload dist/* diff --git a/.github/workflows/release.moonstreamdb.yml b/.github/workflows/release.moonstreamdb.yml index a55bbfe0..e2fd05e4 100644 --- a/.github/workflows/release.moonstreamdb.yml +++ b/.github/workflows/release.moonstreamdb.yml @@ -26,5 +26,5 @@ jobs: TWINE_USERNAME: "__token__" TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_MOONSTREAMDB }} run: | - python setup.py sdist bdist_wheel + python -m build twine upload dist/* diff --git a/.github/workflows/release.moonstreamdbv3.yml b/.github/workflows/release.moonstreamdbv3.yml index 7c8992b7..2c36e051 100644 --- a/.github/workflows/release.moonstreamdbv3.yml +++ b/.github/workflows/release.moonstreamdbv3.yml @@ -26,5 +26,5 @@ jobs: TWINE_USERNAME: "__token__" TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_MOONSTREAMDBV3 }} run: | - python setup.py sdist bdist_wheel + python -m build twine upload dist/* diff --git a/.github/workflows/release.types.python.yml b/.github/workflows/release.types.python.yml index fe5234c0..386480e9 100644 --- a/.github/workflows/release.types.python.yml +++ b/.github/workflows/release.types.python.yml @@ -26,5 +26,5 @@ jobs: TWINE_USERNAME: "__token__" TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_MOONSTREAM_TYPES }} run: | - python setup.py sdist bdist_wheel + python -m build twine upload dist/* From 7c8315e17f5e257ea2476ebf86da70a5c323ff75 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Tue, 7 Jan 2025 10:44:30 +0000 Subject: [PATCH 4/8] Using build package for distribution --- moonstreamdb-v3/MANIFEST.in | 1 + moonstreamdb-v3/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 moonstreamdb-v3/MANIFEST.in diff --git a/moonstreamdb-v3/MANIFEST.in b/moonstreamdb-v3/MANIFEST.in new file mode 100644 index 00000000..618f047b --- /dev/null +++ b/moonstreamdb-v3/MANIFEST.in @@ -0,0 +1 @@ +include moonstreamdbv3/version.txt \ No newline at end of file diff --git a/moonstreamdb-v3/setup.py b/moonstreamdb-v3/setup.py index 7b57de27..54c44f8e 100644 --- a/moonstreamdb-v3/setup.py +++ b/moonstreamdb-v3/setup.py @@ -7,7 +7,7 @@ with open("README.md") as ifp: long_description = ifp.read() setup( - name="moonstreamdb_v3", + name="moonstreamdb-v3", version=VERSION, author="Bugout.dev", author_email="engineers@bugout.dev", @@ -35,6 +35,6 @@ setup( install_requires=["alembic", "psycopg2-binary", "sqlalchemy>=2.0.4"], extras_require={ "dev": ["black", "isort", "mypy"], - "distribute": ["setuptools", "twine", "wheel"], + "distribute": ["build", "twine"], }, ) From c37bb6e0727d9b8c5a5920100bc5aa21fb77b2d3 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Tue, 7 Jan 2025 10:47:51 +0000 Subject: [PATCH 5/8] Using build package for distribution --- types/python/MANIFEST.in | 1 + types/python/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 types/python/MANIFEST.in diff --git a/types/python/MANIFEST.in b/types/python/MANIFEST.in new file mode 100644 index 00000000..c4132043 --- /dev/null +++ b/types/python/MANIFEST.in @@ -0,0 +1 @@ +moonstreamtypes/version.txt \ No newline at end of file diff --git a/types/python/setup.py b/types/python/setup.py index 045906bb..3aaabb8f 100644 --- a/types/python/setup.py +++ b/types/python/setup.py @@ -7,7 +7,7 @@ with open("README.md") as ifp: long_description = ifp.read() setup( - name="moonstream_types", + name="moonstream-types", version=VERSION, author="Moonstream.to", author_email="engineers@moonstream.to", @@ -38,6 +38,6 @@ setup( ], extras_require={ "dev": ["black", "isort", "mypy"], - "distribute": ["setuptools", "twine", "wheel"], + "distribute": ["build", "twine"], }, ) From d6572e1939b30d71c7cfb0a0616e6f2b3da3609a Mon Sep 17 00:00:00 2001 From: kompotkot Date: Tue, 7 Jan 2025 10:48:41 +0000 Subject: [PATCH 6/8] Fix deps version --- types/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/python/setup.py b/types/python/setup.py index 3aaabb8f..f34f7867 100644 --- a/types/python/setup.py +++ b/types/python/setup.py @@ -34,7 +34,7 @@ setup( zip_safe=False, install_requires=[ "moonstreamdb>=0.4.5", - "moonstreamdb_v3>=0.1.3", + "moonstreamdb-v3>=0.1.3", ], extras_require={ "dev": ["black", "isort", "mypy"], From d6d8adb8c3b85475b8e5376d02f3ae1e24c1e3e4 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Tue, 7 Jan 2025 11:12:29 +0000 Subject: [PATCH 7/8] Fix include word --- types/python/MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/python/MANIFEST.in b/types/python/MANIFEST.in index c4132043..909f67e0 100644 --- a/types/python/MANIFEST.in +++ b/types/python/MANIFEST.in @@ -1 +1 @@ -moonstreamtypes/version.txt \ No newline at end of file +include moonstreamtypes/version.txt \ No newline at end of file From 96adca3af248b6d2aeb25672feeb193a4add4db3 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Tue, 7 Jan 2025 11:49:29 +0000 Subject: [PATCH 8/8] Using build package for distribution --- clients/python/moonstream/version.py | 2 +- clients/python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/python/moonstream/version.py b/clients/python/moonstream/version.py index ac068728..f631c4c5 100644 --- a/clients/python/moonstream/version.py +++ b/clients/python/moonstream/version.py @@ -1 +1 @@ -MOONSTREAM_CLIENT_VERSION = "0.1.1" +MOONSTREAM_CLIENT_VERSION = "0.1.2" diff --git a/clients/python/setup.py b/clients/python/setup.py index a3733873..667ddad1 100644 --- a/clients/python/setup.py +++ b/clients/python/setup.py @@ -22,7 +22,7 @@ setup( "types-requests", "types-dataclasses", ], - "distribute": ["setuptools", "twine", "wheel"], + "distribute": ["build", "twine"], }, description="Moonstream: Open source blockchain analytics", long_description=long_description,