diff --git a/ape_vyper/compiler.py b/ape_vyper/compiler.py index c8e4443f..6618d03d 100644 --- a/ape_vyper/compiler.py +++ b/ape_vyper/compiler.py @@ -67,6 +67,7 @@ "0.3.8": "shanghai", "0.3.9": "shanghai", "0.3.10": "shanghai", + "0.4.0rc3": "shanghai", } @@ -544,7 +545,9 @@ def compile( for source_id, output_items in result["contracts"].items(): content = { i + 1: ln - for i, ln in enumerate((contracts_path / source_id).read_text().splitlines()) + for i, ln in enumerate( + (contracts_path / source_id).read_text().splitlines() + ) } for name, output in output_items.items(): # De-compress source map to get PC POS map. diff --git a/tests/ape-config.yaml b/tests/ape-config.yaml index ec6f7227..384adc98 100644 --- a/tests/ape-config.yaml +++ b/tests/ape-config.yaml @@ -10,3 +10,8 @@ vyper: # Allows importing dependencies. import_remapping: - "exampledep=ExampleDependency" + +geth: + ethereum: + local: + uri: "http://127.0.0.1:5550" diff --git a/tests/conftest.py b/tests/conftest.py index fc0cddc0..625aa34b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -172,9 +172,7 @@ def project(config, project_folder): @pytest.fixture def geth_provider(): if not ape.networks.active_provider or ape.networks.provider.name != "geth": - with ape.networks.ethereum.local.use_provider( - "geth", provider_settings={"uri": "http://127.0.0.1:5550"} - ) as provider: + with ape.networks.ethereum.local.use_provider("geth") as provider: yield provider else: yield ape.networks.provider diff --git a/tests/test_compiler.py b/tests/test_compiler.py index 0d67d801..0ad3ae34 100644 --- a/tests/test_compiler.py +++ b/tests/test_compiler.py @@ -158,7 +158,12 @@ def test_get_version_map(project, compiler, all_versions): # Vyper 0.4.0 assertions. actual4 = {x.name for x in actual[VERSION_04]} - expected4 = {'zero_four_module.vy', 'IFaceZeroFour.vyi', 'zero_four.vy', 'sub_reverts_040rc2.vy'} + expected4 = { + "zero_four_module.vy", + "IFaceZeroFour.vyi", + "zero_four.vy", + "sub_reverts_040rc2.vy", + } assert actual4 == expected4