From cea3ab5126e9967e14536c20f0def2301f9f1e5e Mon Sep 17 00:00:00 2001 From: "a.chetaev" Date: Mon, 6 Feb 2023 18:12:04 +0100 Subject: [PATCH] Change mamba version with update imports Signed-off-by: Aleskei Chetaev --- .gitignore | 1 + pyproject.toml | 4 ++-- requirements.txt | 2 +- src/neofs_testlib/utils/converters.py | 2 +- src/neofs_testlib/utils/wallet.py | 5 +++-- tests/test_ssh_shell.py | 1 - tests/test_wallet.py | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c3d58f7..a7f7de0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # ignore IDE files .vscode +.idea # ignore temp files under any path .DS_Store diff --git a/pyproject.toml b/pyproject.toml index 0abc3ac..29e8571 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,12 +19,12 @@ dependencies = [ "allure-python-commons>=2.9.45", "docker>=4.4.0", "importlib_metadata>=5.0; python_version < '3.10'", - "neo-mamba==0.10.0", + "neo-mamba==1.0.0", "paramiko>=2.10.3", "pexpect>=4.8.0", "requests>=2.28.0", ] -requires-python = ">=3.9" +requires-python = ">=3.10" [project.optional-dependencies] dev = ["black", "bumpver", "isort", "pre-commit"] diff --git a/requirements.txt b/requirements.txt index af0ee32..a75b94f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ allure-python-commons==2.9.45 docker==4.4.0 importlib_metadata==5.0.0 -neo-mamba==0.10.0 +neo-mamba==1.0.0 paramiko==2.10.3 pexpect==4.8.0 requests==2.28.1 diff --git a/src/neofs_testlib/utils/converters.py b/src/neofs_testlib/utils/converters.py index 64cef1a..65ea366 100644 --- a/src/neofs_testlib/utils/converters.py +++ b/src/neofs_testlib/utils/converters.py @@ -3,7 +3,7 @@ import binascii import json import base58 -from neo3 import wallet as neo3_wallet +from neo3.wallet import wallet as neo3_wallet def str_to_ascii_hex(input: str) -> str: diff --git a/src/neofs_testlib/utils/wallet.py b/src/neofs_testlib/utils/wallet.py index 9cd248b..5d4ff4a 100644 --- a/src/neofs_testlib/utils/wallet.py +++ b/src/neofs_testlib/utils/wallet.py @@ -1,7 +1,8 @@ import json import logging -from neo3 import wallet as neo3_wallet +from neo3.wallet import wallet as neo3_wallet +from neo3.wallet import account as neo3_account logger = logging.getLogger("neofs.testlib.utils") @@ -14,7 +15,7 @@ def init_wallet(wallet_path: str, wallet_password: str): wallet_password: The password for new wallet. """ wallet = neo3_wallet.Wallet() - account = neo3_wallet.Account.create_new(wallet_password) + account = neo3_account.Account.create_new(wallet_password) wallet.account_add(account) with open(wallet_path, "w") as out: json.dump(wallet.to_json(), out) diff --git a/tests/test_ssh_shell.py b/tests/test_ssh_shell.py index a57b479..0ffeb4d 100644 --- a/tests/test_ssh_shell.py +++ b/tests/test_ssh_shell.py @@ -3,7 +3,6 @@ from unittest import SkipTest, TestCase from neofs_testlib.shell.interfaces import CommandOptions, InteractiveInput from neofs_testlib.shell.ssh_shell import SSHShell - from tests.helpers import format_error_details, get_output_lines diff --git a/tests/test_wallet.py b/tests/test_wallet.py index b9352e9..7e688ab 100644 --- a/tests/test_wallet.py +++ b/tests/test_wallet.py @@ -3,7 +3,7 @@ import os from unittest import TestCase from uuid import uuid4 -from neo3.wallet import Wallet +from neo3.wallet.wallet import Wallet from neofs_testlib.utils.wallet import init_wallet, get_last_address_from_wallet