Skip to content

Commit 747efa1

Browse files
author
Igor
committed
fix feedback
1 parent 5325871 commit 747efa1

File tree

4 files changed

+28
-18
lines changed

4 files changed

+28
-18
lines changed

.github/workflows/e2e-subtensor-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353

5454
- name: Add wasm32-unknown-unknown target
5555
run: |
56-
rustup target add wasm32-unknown-unknown
57-
rustup component add rust-src
56+
rustup target add wasm32-unknown-unknown --toolchain stable-x86_64-unknown-linux-gnu
57+
rustup component add rust-src --toolchain stable-x86_64-unknown-linux-gnu
5858
5959
- name: Clone subtensor repo
6060
run: git clone https://github.com/opentensor/subtensor.git

bittensor_cli/__init__.py

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,26 @@
1515
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
1616
# DEALINGS IN THE SOFTWARE.
1717

18-
from .cli import CLIManager, __version__
18+
from .cli import CLIManager
1919

20+
def version_as_int(version):
21+
import re
22+
_core_version = re.match(r"^\d+\.\d+\.\d+", version).group(0)
23+
_version_split = _core_version.split(".")
24+
__version_info__ = tuple(int(part) for part in _version_split)
25+
_version_int_base = 1000
26+
assert max(__version_info__) < _version_int_base
2027

21-
__all__ = ["CLIManager", "__version__"]
28+
__version_as_int__: int = sum(
29+
e * (_version_int_base**i) for i, e in enumerate(reversed(__version_info__))
30+
)
31+
assert __version_as_int__ < 2**31 # fits in int32
32+
__new_signature_version__ = 360
33+
return __version_as_int__
34+
35+
__version__ = "9.0.0"
36+
__version_as_int__ = version_as_int(__version__)
37+
38+
39+
40+
__all__ = ["CLIManager", "__version__", "__version_as_int__"]

bittensor_cli/cli.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,8 @@ class GitError(Exception):
7272
pass
7373

7474

75-
__version__ = "9.0.0"
7675

7776

78-
_core_version = re.match(r"^\d+\.\d+\.\d+", __version__).group(0)
79-
_version_split = _core_version.split(".")
80-
__version_info__ = tuple(int(part) for part in _version_split)
81-
_version_int_base = 1000
82-
assert max(__version_info__) < _version_int_base
83-
84-
__version_as_int__: int = sum(
85-
e * (_version_int_base**i) for i, e in enumerate(reversed(__version_info__))
86-
)
87-
assert __version_as_int__ < 2**31 # fits in int32
88-
__new_signature_version__ = 360
89-
9077
_epilog = "Made with [bold red]:heart:[/bold red] by The Openτensor Foundaτion"
9178

9279
np.set_printoptions(precision=8, suppress=True, floatmode="fixed")
@@ -484,6 +471,8 @@ def version_callback(value: bool):
484471
"""
485472
Prints the current version/branch-name
486473
"""
474+
from bittensor_cli import __version__
475+
487476
if value:
488477
try:
489478
repo = Repo(os.path.dirname(os.path.dirname(__file__)))
@@ -4915,6 +4904,7 @@ def weights_reveal(
49154904
validate=WV.WALLET_AND_HOTKEY,
49164905
)
49174906

4907+
from bittensor_cli import __version_as_int__
49184908
return self._run_command(
49194909
weights_cmds.reveal_weights(
49204910
self.initialize_chain(network),
@@ -5012,6 +5002,7 @@ def weights_commit(
50125002
ask_for=[WO.NAME, WO.PATH, WO.HOTKEY],
50135003
validate=WV.WALLET_AND_HOTKEY,
50145004
)
5005+
from bittensor_cli import __version_as_int__
50155006
return self._run_command(
50165007
weights_cmds.commit_weights(
50175008
self.initialize_chain(network),

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def read_requirements(path):
4949

5050
# loading version from setup.py
5151
with codecs.open(
52-
os.path.join(here, "bittensor_cli/cli.py"), encoding="utf-8"
52+
os.path.join(here, "bittensor_cli/__init__.py"), encoding="utf-8"
5353
) as init_file:
5454
version_match = re.search(
5555
r"^__version__ = ['\"]([^'\"]*)['\"]", init_file.read(), re.M

0 commit comments

Comments
 (0)