From 5325871e4f106a4a5c1629666cb6b59d9730a4de Mon Sep 17 00:00:00 2001 From: Igor Date: Sun, 16 Feb 2025 15:05:07 -0600 Subject: [PATCH 1/5] remove version --- .github/workflows/e2e-subtensor-tests.yml | 4 ++-- bittensor_cli/__init__.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-subtensor-tests.yml b/.github/workflows/e2e-subtensor-tests.yml index 1c625180..e0c80159 100644 --- a/.github/workflows/e2e-subtensor-tests.yml +++ b/.github/workflows/e2e-subtensor-tests.yml @@ -53,8 +53,8 @@ jobs: - name: Add wasm32-unknown-unknown target run: | - rustup target add wasm32-unknown-unknown --toolchain stable-x86_64-unknown-linux-gnu - rustup component add rust-src --toolchain stable-x86_64-unknown-linux-gnu + rustup target add wasm32-unknown-unknown + rustup component add rust-src - name: Clone subtensor repo run: git clone https://github.com/opentensor/subtensor.git diff --git a/bittensor_cli/__init__.py b/bittensor_cli/__init__.py index 55ce167e..f0ed6447 100644 --- a/bittensor_cli/__init__.py +++ b/bittensor_cli/__init__.py @@ -15,9 +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. -from .cli import CLIManager +from .cli import CLIManager, __version__ -__version__ = "9.0.0" - __all__ = ["CLIManager", "__version__"] From 747efa1b1a38dcfe675d9442985d45cd0a0dff02 Mon Sep 17 00:00:00 2001 From: Igor Date: Tue, 18 Feb 2025 11:24:08 -0600 Subject: [PATCH 2/5] fix feedback --- .github/workflows/e2e-subtensor-tests.yml | 4 ++-- bittensor_cli/__init__.py | 23 +++++++++++++++++++++-- bittensor_cli/cli.py | 17 ++++------------- setup.py | 2 +- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.github/workflows/e2e-subtensor-tests.yml b/.github/workflows/e2e-subtensor-tests.yml index e0c80159..1c625180 100644 --- a/.github/workflows/e2e-subtensor-tests.yml +++ b/.github/workflows/e2e-subtensor-tests.yml @@ -53,8 +53,8 @@ jobs: - name: Add wasm32-unknown-unknown target run: | - rustup target add wasm32-unknown-unknown - rustup component add rust-src + rustup target add wasm32-unknown-unknown --toolchain stable-x86_64-unknown-linux-gnu + rustup component add rust-src --toolchain stable-x86_64-unknown-linux-gnu - name: Clone subtensor repo run: git clone https://github.com/opentensor/subtensor.git diff --git a/bittensor_cli/__init__.py b/bittensor_cli/__init__.py index f0ed6447..5d9f8824 100644 --- a/bittensor_cli/__init__.py +++ b/bittensor_cli/__init__.py @@ -15,7 +15,26 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -from .cli import CLIManager, __version__ +from .cli import CLIManager +def version_as_int(version): + import re + _core_version = re.match(r"^\d+\.\d+\.\d+", version).group(0) + _version_split = _core_version.split(".") + __version_info__ = tuple(int(part) for part in _version_split) + _version_int_base = 1000 + assert max(__version_info__) < _version_int_base -__all__ = ["CLIManager", "__version__"] + __version_as_int__: int = sum( + e * (_version_int_base**i) for i, e in enumerate(reversed(__version_info__)) + ) + assert __version_as_int__ < 2**31 # fits in int32 + __new_signature_version__ = 360 + return __version_as_int__ + +__version__ = "9.0.0" +__version_as_int__ = version_as_int(__version__) + + + +__all__ = ["CLIManager", "__version__", "__version_as_int__"] diff --git a/bittensor_cli/cli.py b/bittensor_cli/cli.py index 0de749e2..0c7b1241 100755 --- a/bittensor_cli/cli.py +++ b/bittensor_cli/cli.py @@ -72,21 +72,8 @@ class GitError(Exception): pass -__version__ = "9.0.0" -_core_version = re.match(r"^\d+\.\d+\.\d+", __version__).group(0) -_version_split = _core_version.split(".") -__version_info__ = tuple(int(part) for part in _version_split) -_version_int_base = 1000 -assert max(__version_info__) < _version_int_base - -__version_as_int__: int = sum( - e * (_version_int_base**i) for i, e in enumerate(reversed(__version_info__)) -) -assert __version_as_int__ < 2**31 # fits in int32 -__new_signature_version__ = 360 - _epilog = "Made with [bold red]:heart:[/bold red] by The Openτensor Foundaτion" np.set_printoptions(precision=8, suppress=True, floatmode="fixed") @@ -484,6 +471,8 @@ def version_callback(value: bool): """ Prints the current version/branch-name """ + from bittensor_cli import __version__ + if value: try: repo = Repo(os.path.dirname(os.path.dirname(__file__))) @@ -4915,6 +4904,7 @@ def weights_reveal( validate=WV.WALLET_AND_HOTKEY, ) + from bittensor_cli import __version_as_int__ return self._run_command( weights_cmds.reveal_weights( self.initialize_chain(network), @@ -5012,6 +5002,7 @@ def weights_commit( ask_for=[WO.NAME, WO.PATH, WO.HOTKEY], validate=WV.WALLET_AND_HOTKEY, ) + from bittensor_cli import __version_as_int__ return self._run_command( weights_cmds.commit_weights( self.initialize_chain(network), diff --git a/setup.py b/setup.py index f9c92cda..d827cb4b 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ def read_requirements(path): # loading version from setup.py with codecs.open( - os.path.join(here, "bittensor_cli/cli.py"), encoding="utf-8" + os.path.join(here, "bittensor_cli/__init__.py"), encoding="utf-8" ) as init_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", init_file.read(), re.M From 7a0c8e40ea9a53ae9bd471c6961dfbc6374c8eb7 Mon Sep 17 00:00:00 2001 From: Igor Date: Wed, 19 Feb 2025 14:34:57 -0600 Subject: [PATCH 3/5] fix feedback --- bittensor_cli/__init__.py | 20 +------------------- bittensor_cli/cli.py | 6 ++---- bittensor_cli/version.py | 18 ++++++++++++++++++ setup.py | 2 +- 4 files changed, 22 insertions(+), 24 deletions(-) create mode 100644 bittensor_cli/version.py diff --git a/bittensor_cli/__init__.py b/bittensor_cli/__init__.py index 5d9f8824..c3f0e010 100644 --- a/bittensor_cli/__init__.py +++ b/bittensor_cli/__init__.py @@ -16,25 +16,7 @@ # DEALINGS IN THE SOFTWARE. from .cli import CLIManager - -def version_as_int(version): - import re - _core_version = re.match(r"^\d+\.\d+\.\d+", version).group(0) - _version_split = _core_version.split(".") - __version_info__ = tuple(int(part) for part in _version_split) - _version_int_base = 1000 - assert max(__version_info__) < _version_int_base - - __version_as_int__: int = sum( - e * (_version_int_base**i) for i, e in enumerate(reversed(__version_info__)) - ) - assert __version_as_int__ < 2**31 # fits in int32 - __new_signature_version__ = 360 - return __version_as_int__ - -__version__ = "9.0.0" -__version_as_int__ = version_as_int(__version__) - +from .version import __version__, __version_as_int__ __all__ = ["CLIManager", "__version__", "__version_as_int__"] diff --git a/bittensor_cli/cli.py b/bittensor_cli/cli.py index 0c7b1241..27d3ed54 100755 --- a/bittensor_cli/cli.py +++ b/bittensor_cli/cli.py @@ -27,6 +27,7 @@ Constants, COLOR_PALETTE, ) +from bittensor_cli.version import __version__, __version_as_int__ from bittensor_cli.src.bittensor import utils from bittensor_cli.src.bittensor.balances import Balance from async_substrate_interface.errors import SubstrateRequestException @@ -471,8 +472,6 @@ def version_callback(value: bool): """ Prints the current version/branch-name """ - from bittensor_cli import __version__ - if value: try: repo = Repo(os.path.dirname(os.path.dirname(__file__))) @@ -4904,7 +4903,6 @@ def weights_reveal( validate=WV.WALLET_AND_HOTKEY, ) - from bittensor_cli import __version_as_int__ return self._run_command( weights_cmds.reveal_weights( self.initialize_chain(network), @@ -5002,7 +5000,7 @@ def weights_commit( ask_for=[WO.NAME, WO.PATH, WO.HOTKEY], validate=WV.WALLET_AND_HOTKEY, ) - from bittensor_cli import __version_as_int__ + return self._run_command( weights_cmds.commit_weights( self.initialize_chain(network), diff --git a/bittensor_cli/version.py b/bittensor_cli/version.py new file mode 100644 index 00000000..b47664c9 --- /dev/null +++ b/bittensor_cli/version.py @@ -0,0 +1,18 @@ +import re + +def version_as_int(version): + _core_version = re.match(r"^\d+\.\d+\.\d+", version).group(0) + _version_split = _core_version.split(".") + __version_info__ = tuple(int(part) for part in _version_split) + _version_int_base = 1000 + assert max(__version_info__) < _version_int_base + + __version_as_int__: int = sum( + e * (_version_int_base**i) for i, e in enumerate(reversed(__version_info__)) + ) + assert __version_as_int__ < 2**31 # fits in int32 + __new_signature_version__ = 360 + return __version_as_int__ + +__version__ = "9.0.0" +__version_as_int__ = version_as_int(__version__) diff --git a/setup.py b/setup.py index d827cb4b..45bfc0fa 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ def read_requirements(path): # loading version from setup.py with codecs.open( - os.path.join(here, "bittensor_cli/__init__.py"), encoding="utf-8" + os.path.join(here, "bittensor_cli/version.py"), encoding="utf-8" ) as init_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", init_file.read(), re.M From b1ec1446d232499408814699ba680d8bc00ea4c6 Mon Sep 17 00:00:00 2001 From: igorsyl Date: Wed, 19 Feb 2025 14:42:46 -0600 Subject: [PATCH 4/5] fix feedback --- bittensor_cli/cli.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bittensor_cli/cli.py b/bittensor_cli/cli.py index ccf6bcb3..da8f8ffd 100755 --- a/bittensor_cli/cli.py +++ b/bittensor_cli/cli.py @@ -2589,7 +2589,6 @@ def wallet_set_id( additional, github_repo, ) - return self._run_command( wallets.set_id( wallet, From 2bb818cbeb6b17cf43793b97e37eca5905c34a67 Mon Sep 17 00:00:00 2001 From: igorsyl Date: Wed, 19 Feb 2025 14:43:20 -0600 Subject: [PATCH 5/5] fix feedback --- bittensor_cli/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bittensor_cli/cli.py b/bittensor_cli/cli.py index da8f8ffd..f5e0cf90 100755 --- a/bittensor_cli/cli.py +++ b/bittensor_cli/cli.py @@ -2589,6 +2589,7 @@ def wallet_set_id( additional, github_repo, ) + return self._run_command( wallets.set_id( wallet, @@ -5021,7 +5022,6 @@ def weights_commit( ask_for=[WO.NAME, WO.PATH, WO.HOTKEY], validate=WV.WALLET_AND_HOTKEY, ) - return self._run_command( weights_cmds.commit_weights( self.initialize_chain(network),