From bebd7773647ccb6de6644e3c34299d4631c1df0c Mon Sep 17 00:00:00 2001 From: kiruxaspb Date: Wed, 25 Dec 2024 17:39:15 +0300 Subject: [PATCH 1/5] Fixex package name and reqs for implement pep 625 --- requirements.txt | 2 +- setup.py | 5 ++--- version.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 82a8e571..c07cc6b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,6 @@ jsonschema==4.0.0 eth-account==0.9.0 trezor==0.13.8 ledgerblue==0.1.48 -snet.contracts==0.1.1 +snet-contracts==0.1.2 lighthouseweb3==0.1.4 cryptography==43.0.3 \ No newline at end of file diff --git a/setup.py b/setup.py index f27b162c..26f55ed8 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ from snet.cli.utils.utils import compile_proto from version import __version__ -PACKAGE_NAME = 'snet.cli' +PACKAGE_NAME = 'snet-cli' this_directory = os.path.abspath(os.path.dirname(__file__)) @@ -50,8 +50,7 @@ def run(self): setup( name=PACKAGE_NAME, version=__version__, - packages=find_namespace_packages(include=['snet.*']), - namespace_packages=['snet'], + packages=find_namespace_packages(include=['snet*']), url='https://github.com/singnet/snet-cli', author="SingularityNET Foundation", author_email="info@singularitynet.io", diff --git a/version.py b/version.py index 3d67cd6b..54499df3 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -__version__ = "2.4.0" +__version__ = "2.4.1" From 8d6b5a17c75890f8a5dc5c677ffdaf0da889a121 Mon Sep 17 00:00:00 2001 From: kiruxaspb <65371121+kiruxaspb@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:16:21 +0300 Subject: [PATCH 2/5] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c07cc6b6..5580833f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,6 @@ jsonschema==4.0.0 eth-account==0.9.0 trezor==0.13.8 ledgerblue==0.1.48 -snet-contracts==0.1.2 +snet-contracts==0.2.1 lighthouseweb3==0.1.4 -cryptography==43.0.3 \ No newline at end of file +cryptography==43.0.3 From 313de59701e3b1095f77a399e3451229ad0b640f Mon Sep 17 00:00:00 2001 From: Arondondon Date: Mon, 27 Jan 2025 12:23:59 +0300 Subject: [PATCH 3/5] Fixed org_schema bug --- MANIFEST.in | 3 +-- snet/cli/resources/package.json | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 snet/cli/resources/package.json diff --git a/MANIFEST.in b/MANIFEST.in index 92a5b275..11fc35c8 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,4 @@ -include snet/cli/resources/proto/* -include snet/cli/resources/package.json +include snet/cli/resources/* recursive-exclude * .git recursive-exclude * node_modules diff --git a/snet/cli/resources/package.json b/snet/cli/resources/package.json deleted file mode 100644 index 15db6109..00000000 --- a/snet/cli/resources/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "grpc-tools": "1.9.0" - } -} From 706aec3ecf81551a852e39c3722eb92d12997f25 Mon Sep 17 00:00:00 2001 From: kiruxaspb Date: Mon, 27 Jan 2025 16:26:50 +0300 Subject: [PATCH 4/5] Fix package name in README --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cbc1f024..1c215855 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ The package is published in PyPI at the following link: -|Package |Description | -|----------------------------------------------|---------------------------------------------------------------------| -|[snet.cli](https://pypi.org/project/snet.cli/)|Command line interface to interact with the SingularityNET platform | +| Package |Description | +|------------------------------------------------|---------------------------------------------------------------------| +| [snet-cli](https://pypi.org/project/snet-cli/) |Command line interface to interact with the SingularityNET platform | ## License @@ -16,7 +16,7 @@ This project is licensed under the MIT License - see the ## Getting Started The instruction down below describes the installation of the SingularityNET CLI. -Please check our full [Documentation](http://snet-cli-docs.singularitynet.io/). +Please check our full [Documentation](https://dev.singularitynet.io/docs/products/DecentralizedAIPlatform/CLI/). ### Prerequisites @@ -36,7 +36,7 @@ sudo apt-get install libudev-dev libusb-1.0-0-dev ### Install snet-cli using pip ```bash -$ pip3 install snet.cli +$ pip3 install snet-cli ``` From 0f3cbbc044383fdacd665b2ae395a70882ebbb7a Mon Sep 17 00:00:00 2001 From: kiruxaspb Date: Tue, 28 Jan 2025 16:35:51 +0300 Subject: [PATCH 5/5] fix build package --- .github/workflows/dev.yml | 2 +- .github/workflows/master.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index f6bbbee1..3f7f2ae8 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -39,7 +39,7 @@ jobs: - name: install snet-cli run: | # ./scripts/blockchain install - pip3 install -e . --break-system-packages + pip3 install . --break-system-packages # - name: install platform-contracts # run: | diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 46e782c9..020a219d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -39,7 +39,7 @@ jobs: - name: install snet-cli run: | # ./scripts/blockchain install - pip3 install -e . --break-system-packages + pip3 install . --break-system-packages # - name: install platform-contracts # run: |