From 8873c3e6935c16037a9e82dd5d1f399a35e33e5c Mon Sep 17 00:00:00 2001 From: Don Freeman Date: Mon, 9 May 2022 11:56:05 -0400 Subject: [PATCH] removed deprecated images (#2462) * removed deprecated images * newsfragment --- .circleci/config.yml | 65 ++++++++++++++++++------------------- newsfragments/2462.misc.rst | 1 + 2 files changed, 32 insertions(+), 34 deletions(-) create mode 100644 newsfragments/2462.misc.rst diff --git a/.circleci/config.yml b/.circleci/config.yml index b6c2227cbe..df5cb5d058 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ common: &common command: pip install --user tox - run: name: run tox - command: ~/.local/bin/tox -r + command: python -m tox -r - save_cache: paths: - .tox @@ -46,7 +46,7 @@ docs_steps: &docs_steps command: pip install -U web3 - run: name: run tox - command: ~/.local/bin/tox -r + command: python -m tox -r - save_cache: paths: - .tox @@ -128,7 +128,7 @@ geth_steps: &geth_steps geth makedag 0 $HOME/.ethash - run: name: run tox - command: ~/.local/bin/tox -r + command: python -m tox -r - save_cache: paths: - .tox @@ -168,7 +168,7 @@ geth_custom_steps: &geth_custom_steps ./custom_geth makedag 0 $HOME/.ethash - run: name: run tox - command: ~/.local/bin/tox -r + command: python -m tox -r - save_cache: paths: - .tox @@ -204,7 +204,7 @@ ethpm_steps: ðpm_steps command: pip install --user tox - run: name: run tox - command: ~/.local/bin/tox -r + command: python -m tox -r - save_cache: paths: - .tox @@ -241,20 +241,17 @@ windows_steps: &windows_steps jobs: - # - # Python 3.6 - # lint: <<: *common docker: - - image: circleci/python:3.6 + - image: cimg/python:3.9 environment: TOXENV: lint docs: <<: *docs_steps docker: - - image: circleci/python:3.6 + - image: cimg/python:3.9 environment: TOXENV: docs @@ -353,21 +350,21 @@ jobs: py37-core: <<: *common docker: - - image: circleci/python:3.7 + - image: cimg/python:3.7 environment: TOXENV: py37-core py37-ens: <<: *common docker: - - image: circleci/python:3.7 + - image: cimg/python:3.7 environment: TOXENV: py37-ens py37-ethpm: <<: *ethpm_steps docker: - - image: circleci/python:3.7 + - image: cimg/python:3.7 environment: TOXENV: py37-ethpm # Please don't use this key for any shenanigans @@ -376,7 +373,7 @@ jobs: py37-integration-goethereum-ipc: <<: *geth_steps docker: - - image: circleci/python:3.7 + - image: cimg/python:3.7 environment: TOXENV: py37-integration-goethereum-ipc GETH_VERSION: v1.10.17 @@ -384,7 +381,7 @@ jobs: py37-integration-goethereum-http: <<: *geth_steps docker: - - image: circleci/python:3.7 + - image: cimg/python:3.7 environment: TOXENV: py37-integration-goethereum-http GETH_VERSION: v1.10.17 @@ -392,7 +389,7 @@ jobs: py37-integration-goethereum-ws: <<: *geth_steps docker: - - image: circleci/python:3.7 + - image: cimg/python:3.7 environment: TOXENV: py37-integration-goethereum-ws GETH_VERSION: v1.10.17 @@ -427,7 +424,7 @@ jobs: py37-integration-ethtester-pyevm: <<: *common docker: - - image: circleci/python:3.7 + - image: cimg/python:3.7 environment: TOXENV: py37-integration-ethtester ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend @@ -435,7 +432,7 @@ jobs: py37-wheel-cli: <<: *common docker: - - image: circleci/python:3.7 + - image: cimg/python:3.7 environment: TOXENV: py37-wheel-cli @@ -450,21 +447,21 @@ jobs: py38-core: <<: *common docker: - - image: circleci/python:3.8 + - image: cimg/python:3.8 environment: TOXENV: py38-core py38-ens: <<: *common docker: - - image: circleci/python:3.8 + - image: cimg/python:3.8 environment: TOXENV: py38-ens py38-ethpm: <<: *ethpm_steps docker: - - image: circleci/python:3.8 + - image: cimg/python:3.8 environment: TOXENV: py38-ethpm # Please don't use this key for any shenanigans @@ -473,7 +470,7 @@ jobs: py38-integration-goethereum-ipc: <<: *geth_steps docker: - - image: circleci/python:3.8 + - image: cimg/python:3.8 environment: TOXENV: py38-integration-goethereum-ipc GETH_VERSION: v1.10.17 @@ -481,7 +478,7 @@ jobs: py38-integration-goethereum-http: <<: *geth_steps docker: - - image: circleci/python:3.8 + - image: cimg/python:3.8 environment: TOXENV: py38-integration-goethereum-http GETH_VERSION: v1.10.17 @@ -489,7 +486,7 @@ jobs: py38-integration-goethereum-ws: <<: *geth_steps docker: - - image: circleci/python:3.8 + - image: cimg/python:3.8 environment: TOXENV: py38-integration-goethereum-ws GETH_VERSION: v1.10.17 @@ -524,7 +521,7 @@ jobs: py38-integration-ethtester-pyevm: <<: *common docker: - - image: circleci/python:3.8 + - image: cimg/python:3.8 environment: TOXENV: py38-integration-ethtester ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend @@ -532,7 +529,7 @@ jobs: py38-wheel-cli: <<: *common docker: - - image: circleci/python:3.8 + - image: cimg/python:3.8 environment: TOXENV: py38-wheel-cli @@ -542,21 +539,21 @@ jobs: py39-core: <<: *common docker: - - image: circleci/python:3.9 + - image: cimg/python:3.9 environment: TOXENV: py39-core py39-ens: <<: *common docker: - - image: circleci/python:3.9 + - image: cimg/python:3.9 environment: TOXENV: py39-ens py39-ethpm: <<: *ethpm_steps docker: - - image: circleci/python:3.9 + - image: cimg/python:3.9 environment: TOXENV: py39-ethpm # Please don't use this key for any shenanigans @@ -565,7 +562,7 @@ jobs: py39-integration-goethereum-ipc: <<: *geth_steps docker: - - image: circleci/python:3.9 + - image: cimg/python:3.9 environment: TOXENV: py39-integration-goethereum-ipc GETH_VERSION: v1.10.17 @@ -573,7 +570,7 @@ jobs: py39-integration-goethereum-http: <<: *geth_steps docker: - - image: circleci/python:3.9 + - image: cimg/python:3.9 environment: TOXENV: py39-integration-goethereum-http GETH_VERSION: v1.10.17 @@ -581,7 +578,7 @@ jobs: py39-integration-goethereum-ws: <<: *geth_steps docker: - - image: circleci/python:3.9 + - image: cimg/python:3.9 environment: TOXENV: py39-integration-goethereum-ws GETH_VERSION: v1.10.17 @@ -616,7 +613,7 @@ jobs: py39-integration-ethtester-pyevm: <<: *common docker: - - image: circleci/python:3.9 + - image: cimg/python:3.9 environment: TOXENV: py39-integration-ethtester ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend @@ -624,7 +621,7 @@ jobs: py39-wheel-cli: <<: *common docker: - - image: circleci/python:3.9 + - image: cimg/python:3.9 environment: TOXENV: py39-wheel-cli diff --git a/newsfragments/2462.misc.rst b/newsfragments/2462.misc.rst new file mode 100644 index 0000000000..4d7aa162e3 --- /dev/null +++ b/newsfragments/2462.misc.rst @@ -0,0 +1 @@ +The circleci/ images have been deprecated for a while moving to cimg/ images. \ No newline at end of file