Skip to content

Commit

Permalink
bump Geth fixture to v1.10.4
Browse files Browse the repository at this point in the history
  • Loading branch information
wolovim committed Jun 17, 2021
1 parent 588e0c0 commit cb8f7c8
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 17 deletions.
26 changes: 13 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,23 +219,23 @@ jobs:
- image: circleci/python:3.6
environment:
TOXENV: py36-integration-goethereum-ipc
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

py36-integration-goethereum-http:
<<: *geth_steps
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-integration-goethereum-http
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

py36-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-integration-goethereum-ws
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

# py36-integration-parity-ipc:
# <<: *parity_steps
Expand Down Expand Up @@ -311,23 +311,23 @@ jobs:
- image: circleci/python:3.7
environment:
TOXENV: py37-integration-goethereum-ipc
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

py37-integration-goethereum-http:
<<: *geth_steps
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-integration-goethereum-http
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

py37-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-integration-goethereum-ws
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

# py37-integration-parity-ipc:
# <<: *parity_steps
Expand Down Expand Up @@ -408,23 +408,23 @@ jobs:
- image: circleci/python:3.8
environment:
TOXENV: py38-integration-goethereum-ipc
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

py38-integration-goethereum-http:
<<: *geth_steps
docker:
- image: circleci/python:3.8
environment:
TOXENV: py38-integration-goethereum-http
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

py38-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: circleci/python:3.8
environment:
TOXENV: py38-integration-goethereum-ws
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

# py38-integration-parity-ipc:
# <<: *parity_steps
Expand Down Expand Up @@ -500,23 +500,23 @@ jobs:
- image: circleci/python:3.9
environment:
TOXENV: py39-integration-goethereum-ipc
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

py39-integration-goethereum-http:
<<: *geth_steps
docker:
- image: circleci/python:3.9
environment:
TOXENV: py39-integration-goethereum-http
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

py39-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: circleci/python:3.9
environment:
TOXENV: py39-integration-goethereum-ws
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

# py39-integration-parity-ipc:
# <<: *parity_steps
Expand Down Expand Up @@ -566,7 +566,7 @@ jobs:
- image: circleci/python:3.9
environment:
TOXENV: benchmark
GETH_VERSION: v1.10.3
GETH_VERSION: v1.10.4

workflows:
version: 2.1
Expand Down
4 changes: 2 additions & 2 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,13 @@ Geth fixtures

.. code:: sh
$ python -m geth.install v1.10.3
$ python -m geth.install v1.10.4
2. Specify the Geth binary and run the fixture creation script (from within the web3.py directory):

.. code:: sh
$ GETH_BINARY=~/.py-geth/geth-v1.10.3/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.3-fixture
$ GETH_BINARY=~/.py-geth/geth-v1.10.4/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.4-fixture
3. The output of this script is your fixture, a zip file, which is now stored in ``/tests/integration/``.
Update the ``/tests/integration/go_ethereum/conftest.py`` file to point to this new fixture. Delete the old fixture.
Expand Down
1 change: 1 addition & 0 deletions newsfragments/2035.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump Geth test fixture to v1.10.4
Binary file removed tests/integration/geth-1.10.3-fixture.zip
Binary file not shown.
Binary file added tests/integration/geth-1.10.4-fixture.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/integration/go_ethereum/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

KEYFILE_PW = 'web3py-test'

GETH_FIXTURE_ZIP = 'geth-1.10.3-fixture.zip'
GETH_FIXTURE_ZIP = 'geth-1.10.4-fixture.zip'


@pytest.fixture(scope='module')
Expand Down
2 changes: 1 addition & 1 deletion web3/tools/benchmark/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
kill_proc_gracefully,
)

GETH_FIXTURE_ZIP = "geth-1.10.3-fixture.zip"
GETH_FIXTURE_ZIP = "geth-1.10.4-fixture.zip"


class GethBenchmarkFixture:
Expand Down

0 comments on commit cb8f7c8

Please sign in to comment.