From 659219f6817c698104aefd7cfacd57d57b28b651 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Thu, 5 Dec 2024 12:11:29 +0800 Subject: [PATCH] deps --- integration_tests/network.py | 7 ++++++- integration_tests/poetry.lock | 8 ++++---- integration_tests/pyproject.toml | 2 +- integration_tests/test_upgrade_with_ibc.py | 3 ++- nix/testenv.nix | 5 ++++- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/integration_tests/network.py b/integration_tests/network.py index cac096cb9c..841e74663f 100644 --- a/integration_tests/network.py +++ b/integration_tests/network.py @@ -186,7 +186,12 @@ def setup_custom_cronos( if wait_port: wait_for_port(ports.evmrpc_port(base_port)) wait_for_port(ports.evmrpc_ws_port(base_port)) - c = Cronos(path / "cronos_777-1", chain_binary=chain_binary or "cronosd") + binary = next( + (b.strip() for b in chain_binary.split(",") if "cronosd" in b), + None, + ) + chain_binary = binary if binary else "cronosd" + c = Cronos(path / "cronos_777-1", chain_binary=chain_binary) w3_wait_for_block(c.w3, 1) yield c finally: diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock index 9224e4e795..5da27c53ae 100644 --- a/integration_tests/poetry.lock +++ b/integration_tests/poetry.lock @@ -1758,9 +1758,9 @@ tomlkit = "^0" [package.source] type = "git" -url = "https://github.com/mmsqe/pystarport.git" -reference = "fix_cmd" -resolved_reference = "8f2632157c0eb402cb722858d54045cf02d655d4" +url = "https://github.com/crypto-com/pystarport.git" +reference = "main" +resolved_reference = "e28bf7ae7349ddb6bd4388a557b709e8ace4ae35" [[package]] name = "pytest" @@ -2603,4 +2603,4 @@ propcache = ">=0.2.0" [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "8fb1a35abf6b066ce8370ba941d0a7bc985b2580e1b73e1f6a164697a8d36da6" +content-hash = "dddaf6734a8b8af55d1f58dee6a746427c54a40ede3c4d6638a304ec8ef8ac2c" diff --git a/integration_tests/pyproject.toml b/integration_tests/pyproject.toml index 960684d789..14aa78da69 100644 --- a/integration_tests/pyproject.toml +++ b/integration_tests/pyproject.toml @@ -17,7 +17,7 @@ protobuf = "^4.25" python-dateutil = "^2.8" web3 = "^6.15" python-dotenv = "^1.0" -pystarport = { git = "https://github.com/mmsqe/pystarport.git", branch = "fix_cmd" } +pystarport = { git = "https://github.com/crypto-com/pystarport.git", branch = "main" } websockets = "^12.0" toml = "^0" jsonnet = "^0" diff --git a/integration_tests/test_upgrade_with_ibc.py b/integration_tests/test_upgrade_with_ibc.py index ff96f5ef68..2c0f0b1478 100644 --- a/integration_tests/test_upgrade_with_ibc.py +++ b/integration_tests/test_upgrade_with_ibc.py @@ -39,13 +39,14 @@ def ibc(tmp_path_factory): for d in upgrades.iterdir(): d.chmod(mod) + binary = str(upgrades / "genesis/bin/cronosd") yield from prepare_network( path, name, incentivized=False, connection_only=True, post_init=post_init, - chain_binary=str(upgrades / "genesis/bin/cronosd"), + chain_binary=f"chain-maind,{binary}", relayer=cluster.Relayer.RLY.value, ) diff --git a/nix/testenv.nix b/nix/testenv.nix index 03454c86d8..6f712f9564 100644 --- a/nix/testenv.nix +++ b/nix/testenv.nix @@ -19,7 +19,10 @@ poetry2nix.mkPoetryEnv { flake8-isort = [ "hatchling" ]; pyunormalize = [ "setuptools" ]; eth-bloom = [ "setuptools" ]; - docker = [ "hatchling" "hatch-vcs" ]; + docker = [ + "hatchling" + "hatch-vcs" + ]; }; in lib.mapAttrs (