ethereum · pacrob · Mar 7, 2024 · Mar 1, 2024 · Mar 1, 2024 · Mar 1, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,9 +20,6 @@ common: &common
     - restore_cache:
         keys:
           - cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-    - run:
-        name: checkout ethpm-spec submodule
-        command: git submodule update --init --recursive
     - run:
         name: install dependencies
         command: |
@@ -49,9 +46,6 @@ docs_steps: &docs_steps
     - restore_cache:
         keys:
           - cache-docs-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-    - run:
-        name: checkout ethpm-spec submodule
-        command: git submodule update --init --recursive
     - run:
         name: install dependencies
         command: |
@@ -159,43 +153,6 @@ geth_custom_steps: &geth_custom_steps
           - ~/.ethash
         key: cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
 
-ethpm_steps: &ethpm_steps
-  working_directory: ~/repo
-  resource_class: xlarge
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - ethpm-cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-    - run:
-        name: install ipfs
-        command:
-          wget https://dist.ipfs.io/go-ipfs/v0.7.0/go-ipfs_v0.7.0_linux-amd64.tar.gz &&
-          tar xvfz go-ipfs_v0.7.0_linux-amd64.tar.gz &&
-          sudo cp go-ipfs/ipfs /usr/local/bin &&
-          ipfs init
-    - run:
-        name: start ipfs node in background
-        command: ipfs daemon
-        background: true
-    - run:
-        name: checkout ethpm-spec submodule
-        command: git submodule update --init --recursive
-    - run:
-        name: install dependencies
-        command: |
-          python -m pip install --upgrade pip
-          python -m pip install tox
-    - run:
-        name: run tox
-        command: python -m tox -r
-    - save_cache:
-        paths:
-          - .tox
-          - ~/.cache/pip
-          - ~/.local
-        key: ethpm-cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-
 orbs:
   win: circleci/[email protected]
 
@@ -209,9 +166,6 @@ windows_steps: &windows_steps
     - restore_cache:
         keys:
           - windows-cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-    - run:
-        name: checkout ethpm-spec submodule
-        command: git submodule update --init --recursive
     - run:
         name: install dependencies
         command: |
@@ -272,15 +226,6 @@ jobs:
     environment:
       TOXENV: py38-ensip15
 
-  py38-ethpm:
-    <<: *ethpm_steps
-    docker:
-      - image: cimg/python:3.8
-    environment:
-      TOXENV: py38-ethpm
-      # Please don't use this key for any shenanigans
-      WEB3_INFURA_PROJECT_ID: $WEB3_INFURA_PROJECT_ID
-
   py38-integration-goethereum-ipc:
     <<: *geth_steps
     docker:
@@ -419,14 +364,6 @@ jobs:
     environment:
       TOXENV: py39-ensip15
 
-  py39-ethpm:
-    <<: *ethpm_steps
-    docker:
-      - image: cimg/python:3.9
-    environment:
-      TOXENV: py39-ethpm
-      WEB3_INFURA_PROJECT_ID: $WEB3_INFURA_PROJECT_ID
-
   py39-integration-goethereum-ipc:
     <<: *geth_steps
     docker:
@@ -565,14 +502,6 @@ jobs:
     environment:
       TOXENV: py310-ensip15
 
-  py310-ethpm:
-    <<: *ethpm_steps
-    docker:
-      - image: cimg/python:3.10
-    environment:
-      TOXENV: py310-ethpm
-      WEB3_INFURA_PROJECT_ID: $WEB3_INFURA_PROJECT_ID
-
   py310-integration-goethereum-ipc:
     <<: *geth_steps
     docker:
@@ -716,15 +645,6 @@ jobs:
     environment:
       TOXENV: py311-ensip15
 
-  py311-ethpm:
-    <<: *ethpm_steps
-    docker:
-      - image: cimg/python:3.11
-    environment:
-      TOXENV: py311-ethpm
-      # Please don't use this key for any shenanigans
-      WEB3_INFURA_PROJECT_ID: $WEB3_INFURA_PROJECT_ID
-
   py311-integration-goethereum-ipc:
     <<: *geth_steps
     docker:
@@ -850,7 +770,6 @@ workflows:
       - py38-lint
       - py38-ens
       - py38-ensip15
-      - py38-ethpm
       - py38-integration-goethereum-ipc
       - py38-integration-goethereum-ipc_async
       - py38-integration-goethereum-ipc_flaky
@@ -868,7 +787,6 @@ workflows:
       - py39-lint
       - py39-ens
       - py39-ensip15
-      - py39-ethpm
       - py39-integration-goethereum-ipc
       - py39-integration-goethereum-ipc_async
       - py39-integration-goethereum-ipc_flaky
@@ -886,7 +804,6 @@ workflows:
       - py310-lint
       - py310-ens
       - py310-ensip15
-      - py310-ethpm
       - py310-integration-goethereum-ipc
       - py310-integration-goethereum-ipc_async
       - py310-integration-goethereum-ipc_flaky
@@ -904,7 +821,6 @@ workflows:
       - py311-lint
       - py311-ens
       - py311-ensip15
-      - py311-ethpm
       - py311-integration-goethereum-ipc
       - py311-integration-goethereum-ipc_async
       - py311-integration-goethereum-ipc_flaky

diff --git a/.gitignore b/.gitignore
@@ -54,7 +54,6 @@ docs/web3.providers.persistent.rst
 docs/web3.rst
 docs/web3.scripts.release.rst
 docs/web3.scripts.rst
-docs/web3.tools.pytest_ethereum.rst
 docs/web3.tools.rst
 
 # Blockchain

diff --git a/.gitmodules b/.gitmodules
diff --git a/.isort.cfg b/.isort.cfg
@@ -8,9 +8,9 @@ combine_as_imports=true
 force_sort_within_sections=true
 include_trailing_comma=true
 extra_standard_library=pytest
-known_first_party=web3,ens,ethpm
+known_first_party=web3,ens
 known_third_party=eth_tester
 line_length=88
 use_parentheses=true
 # skip `__init__.py` files because sometimes order of initialization is important
-skip=__init__.py,web3/main.py,web3/utils/windows.py,ethpm/ethpm-spec/,ethpm/_utils/protobuf/ipfs_file_pb2.py,
+skip=__init__.py,web3/main.py,web3/utils/windows.py,
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y libssl-dev
 COPY web3 ./web3/
 COPY tests ./tests/
 COPY ens ./ens/
-COPY ethpm ./ethpm/
 
 COPY setup.py .
 COPY README.md .

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,7 +5,3 @@ recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 
 recursive-include ens/specs *
-
-recursive-include ethpm/assets *
-recursive-include ethpm/ethpm-spec/examples *
-recursive-include ethpm/ethpm-spec/spec *
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ benchmark:
 	tox -e benchmark
 
 build-docs:
-	sphinx-apidoc -o docs/ . setup.py "*conftest*" "tests" "ethpm" "web3/tools/*"
+	sphinx-apidoc -o docs/ . setup.py "*conftest*" "tests" "web3/tools/*"
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
 	$(MAKE) -C docs doctest