From e4d37f9f22fc73b7b0d321c39bccb1c131693e57 Mon Sep 17 00:00:00 2001 From: Roman <167799377+roman-opentensor@users.noreply.github.com> Date: Mon, 7 Oct 2024 08:32:27 -0700 Subject: [PATCH 1/9] remove commit from e2e tests (#2340) --- tests/e2e_tests/conftest.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/e2e_tests/conftest.py b/tests/e2e_tests/conftest.py index 5f562039ee..59170c9512 100644 --- a/tests/e2e_tests/conftest.py +++ b/tests/e2e_tests/conftest.py @@ -46,9 +46,7 @@ def local_chain(request): # install neuron templates logging.info("downloading and installing neuron templates from github") # commit with subnet-template-repo changes for rust wallet - templates_dir = clone_or_update_templates( - "334d3da101279218b3a4c9d72a12d517f6e39be3" - ) + templates_dir = clone_or_update_templates() install_templates(templates_dir) timestamp = int(time.time()) From d3ce020c28f7959a629245ae71a83aee7809a5ff Mon Sep 17 00:00:00 2001 From: Watchmaker Date: Tue, 8 Oct 2024 14:18:58 -0700 Subject: [PATCH 2/9] Fix the install command syntax --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 541b8ec6bb..5a5aa59005 100644 --- a/README.md +++ b/README.md @@ -145,12 +145,22 @@ You can install using any of the below options: ```python pip install bittensor[btcli] ``` + In some environments the above command may fail, in which case run the command with added quotes as shown below: + + ```python + pip install "bittensor[btcli]" + ``` - **Install SDK with `torch`**: Install Bittensor SDK with [`torch`](https://pytorch.org/docs/stable/torch.html). ```python pip install bittensor[torch] ``` + In some environments the above command may fail, in which case run the command with added quotes as shown below: + + ```python + pip install "bittensor[torch]" + ``` - **Install SDK with `cubit`**: Install Bittensor SDK with [`cubit`](https://github.com/opentensor/cubit). From 438650aa1488ce185a3dca0b96f6f210e3e89698 Mon Sep 17 00:00:00 2001 From: Roman <167799377+roman-opentensor@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:44:04 -0700 Subject: [PATCH 3/9] add bittensor-cli as prod deps for sdk (#2345) add bittensor-cli as prod deps --- requirements/btcli.txt | 1 - requirements/prod.txt | 3 ++- setup.py | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 requirements/btcli.txt diff --git a/requirements/btcli.txt b/requirements/btcli.txt deleted file mode 100644 index 6a86c87bcb..0000000000 --- a/requirements/btcli.txt +++ /dev/null @@ -1 +0,0 @@ -bittensor-cli \ No newline at end of file diff --git a/requirements/prod.txt b/requirements/prod.txt index 6b9b5380c5..dd78c89e36 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1,5 +1,6 @@ wheel setuptools~=70.0.0 +bittensor-cli aiohttp~=3.9 bt-decode colorama~=0.4.6 @@ -20,4 +21,4 @@ python-Levenshtein scalecodec==1.2.11 substrate-interface~=1.7.9 uvicorn -bittensor-wallet==2.0.1 \ No newline at end of file +bittensor-wallet==2.0.1 diff --git a/setup.py b/setup.py index 290274bd84..efc9f926e2 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,6 @@ def read_requirements(path): requirements = read_requirements("requirements/prod.txt") -extra_requirements_btcli = read_requirements("requirements/btcli.txt") extra_requirements_dev = read_requirements("requirements/dev.txt") extra_requirements_cubit = read_requirements("requirements/cubit.txt") extra_requirements_torch = read_requirements("requirements/torch.txt") @@ -75,7 +74,6 @@ def read_requirements(path): python_requires=">=3.9", install_requires=requirements, extras_require={ - "btcli": extra_requirements_btcli, "dev": extra_requirements_dev, "torch": extra_requirements_torch, }, From 2e3e0a38e3ff52e4709b07cb949f76546d7a4b97 Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 9 Oct 2024 17:23:05 -0700 Subject: [PATCH 4/9] add config test --- tests/unit_tests/test_config.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 tests/unit_tests/test_config.py diff --git a/tests/unit_tests/test_config.py b/tests/unit_tests/test_config.py new file mode 100644 index 0000000000..53754764e1 --- /dev/null +++ b/tests/unit_tests/test_config.py @@ -0,0 +1,27 @@ +import bittensor +import argparse + + +def test_py_config_parsed_successfully_rust_wallet(): + """Verify that python based config object is successfully parsed with rust-based wallet object.""" + # Preps + parser = argparse.ArgumentParser() + + bittensor.wallet.add_args(parser) + bittensor.subtensor.add_args(parser) + bittensor.axon.add_args(parser) + bittensor.logging.add_args(parser) + + config = bittensor.config(parser) + + # since we can't apply mocking to rust implewmented object then replace those directly + config.wallet.name = "new_wallet_name" + config.wallet.hotkey = "new_hotkey" + config.wallet.path = "/some/not_default/path" + + wallet = bittensor.wallet(config=config) + + # Asserts + assert wallet.name == config.wallet.name + assert wallet.hotkey_str == config.wallet.hotkey + assert wallet.path == config.wallet.path From 8c26ae5efe504c3508705cce0b7ef1b605d34989 Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Thu, 10 Oct 2024 13:17:57 -0700 Subject: [PATCH 5/9] Bumps wallet to 2.0.2 --- requirements/prod.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/prod.txt b/requirements/prod.txt index dd78c89e36..97aafc22a4 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -21,4 +21,4 @@ python-Levenshtein scalecodec==1.2.11 substrate-interface~=1.7.9 uvicorn -bittensor-wallet==2.0.1 +bittensor-wallet==2.0.2 From 66edd498a46c738cc534b476360b31e05c8f9ef8 Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Thu, 10 Oct 2024 13:43:37 -0700 Subject: [PATCH 6/9] Updates >= for btwallet 2.0.2 --- requirements/prod.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/prod.txt b/requirements/prod.txt index 97aafc22a4..4a319c506c 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -21,4 +21,4 @@ python-Levenshtein scalecodec==1.2.11 substrate-interface~=1.7.9 uvicorn -bittensor-wallet==2.0.2 +bittensor-wallet>=2.0.2 From c7cbae9931d3edc7eccb4aeee3d7a8b279844712 Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Thu, 10 Oct 2024 14:51:43 -0700 Subject: [PATCH 7/9] Bumps version for 8.2.0 --- bittensor/core/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bittensor/core/settings.py b/bittensor/core/settings.py index 477d4d955b..36314c2b72 100644 --- a/bittensor/core/settings.py +++ b/bittensor/core/settings.py @@ -15,7 +15,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -__version__ = "8.1.1" +__version__ = "8.2.0" import os import re From cbf466efcb842d338b356e71a6a634f7ab1c412c Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Thu, 10 Oct 2024 15:04:28 -0700 Subject: [PATCH 8/9] Updates changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47b9813d41..b04ebaa0f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 8.2.0 /2024-10-10 + +## What's Changed +* remove commit from e2e tests by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2340 +* add bittensor-cli as prod deps for sdk by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2345 +* Fix the install command syntax by @rajkaramchedu in https://github.com/opentensor/bittensor/pull/2346 +* add config test by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2347 +* Bumps version for 8.2.0 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2348 + +**Full Changelog**: https://github.com/opentensor/bittensor/compare/v8.1.1...v8.2.0 + ## 8.1.1 /2024-10-04 ## What's Changed From bfe57085e386fe07de86780c1b1698f9b446472f Mon Sep 17 00:00:00 2001 From: Watchmaker Date: Thu, 10 Oct 2024 15:23:01 -0700 Subject: [PATCH 9/9] Update README.md --- README.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/README.md b/README.md index 5a5aa59005..109a321030 100644 --- a/README.md +++ b/README.md @@ -134,23 +134,12 @@ git clone https://github.com/opentensor/bittensor.git You can install using any of the below options: -- **Install only SDK**: Run the below command to install Bittensor SDK in the above virtual environment. +- **Install SDK**: Run the below command to install Bittensor SDK in the above virtual environment. This will also install `btcli`. ```python pip install bittensor ``` -- **Install SDK with `btcli`**: Install Bittensor SDK with `btcli`. The `btcli` will be installed as an independent tool and its Python package is `bittensor-cli`. - - ```python - pip install bittensor[btcli] - ``` - In some environments the above command may fail, in which case run the command with added quotes as shown below: - - ```python - pip install "bittensor[btcli]" - ``` - - **Install SDK with `torch`**: Install Bittensor SDK with [`torch`](https://pytorch.org/docs/stable/torch.html). ```python