try upgrade circleCI to >python3.8 and probably break everything

ethereum · Mar 21, 2022 · 78ae263 · 78ae263
1 parent fd74dfd
commit 78ae263
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 55 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
   # Job(s) with Linux OS
   venv_build:
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.10
     working_directory: ~/repo
     steps:
       - checkout
@@ -40,7 +40,7 @@ jobs:
             - ./venv
   venv_pytest:
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.10
     working_directory: ~/repo
     steps:
       - checkout
@@ -56,7 +56,7 @@ jobs:
           path: test-reports/
   venv_lint:
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.10
     working_directory: ~/repo
     steps:
       - checkout
@@ -65,35 +65,34 @@ jobs:
       - run:
           name: Run linter with venv
           command: make venv_lint
-  tox-py37-core:
+  tox-py310-core:
     <<: *tox_common
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.10
         environment:
-          TOXENV: py37-core
+          TOXENV: py310-core
   tox-py38-core:
     <<: *tox_common
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.8
         environment:
           TOXENV: py38-core
-  tox-py37-script:
+  tox-py310-script:
     <<: *tox_common
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.10
         environment:
-          TOXENV: py37-script
+          TOXENV: py310-script
   tox-py38-script:
     <<: *tox_common
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.8
         environment:
           TOXENV: py38-script
   # Job(s) with Windows OS
-  win-py37-script:
-    executor:
-      name: win/default
-      shell: powershell.exe
+  win-py310-script:
+    machine:
+      image: windows-server-2022-vs2022
     steps:
       - checkout
       - run:
@@ -111,8 +110,8 @@ jobs:
       - run:
           name: Install building requirements on Linux
           command: |
-            env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 3.7.5;
-            pyenv global 3.7.5;
+            env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 3.8.13;
+            pyenv global 3.8.13;
             pip install -r ./build_configs/linux/requirements.txt;
       - run:
           name: Build with build.spec
@@ -121,7 +120,7 @@ jobs:
             export CIRCLE_SHORT_SHA1=$(eval echo $CIRCLE_SHA1 | cut -c -7)
             export BUILD_FILE_NAME=staking_deposit-cli-${CIRCLE_SHORT_SHA1}-linux-amd64;
             mkdir ${BUILD_FILE_NAME};
-            pyenv global 3.7.5;
+            pyenv global 3.8.13;
             pyinstaller --distpath ./${BUILD_FILE_NAME} ./build_configs/linux/build.spec;
       - run:
           name: Test executable binaries
@@ -157,8 +156,8 @@ jobs:
       - run:
           name: Install building requirements on Linux ARM64
           command: |
-            env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 3.7.5;
-            pyenv global 3.7.5;
+            env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 3.8.13;
+            pyenv global 3.8.13;
             pip install -r ./build_configs/linux/requirements.txt;
       - run:
           name: Build with build.spec
@@ -167,7 +166,7 @@ jobs:
             export CIRCLE_SHORT_SHA1=$(eval echo $CIRCLE_SHA1 | cut -c -7)
             export BUILD_FILE_NAME=staking_deposit-cli-${CIRCLE_SHORT_SHA1}-linux-arm64;
             mkdir ${BUILD_FILE_NAME};
-            pyenv global 3.7.5;
+            pyenv global 3.8.13;
             pyinstaller --distpath ./${BUILD_FILE_NAME} ./build_configs/linux/build.spec;
       - run:
           name: Test executable binaries
@@ -193,9 +192,8 @@ jobs:
       - store_artifacts:
           path: /tmp/artifacts
   build-windows:
-    executor:
-      name: win/default
-      shell: powershell.exe
+    machine:
+      image: windows-server-2022-vs2022
     steps:
       - checkout
       - run:
@@ -292,11 +290,11 @@ workflows:
       - venv_lint:
           requires:
             - venv_build
-      - tox-py37-core
+      - tox-py310-core
       - tox-py38-core
-      - tox-py37-script
+      - tox-py310-script
       - tox-py38-script
-      - win-py37-script
+      - win-py310-script
   build_linux:
     jobs:
       - build-linux-amd64

diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ You can find the audit report by Trail of Bits [here](https://github.com/trailof
 
 ### Build requirements
 
-- [Python **3.7+**](https://www.python.org/about/gettingstarted/)
+- [Python **3.8+**](https://www.python.org/about/gettingstarted/)
 - [pip3](https://pip.pypa.io/en/stable/installing/)
 
 ### For Linux or MacOS users
@@ -170,7 +170,7 @@ Your keys can be found at: <YOUR_FOLDER_PATH>
 
 ##### Step 0. Python version checking
 
-Ensure you are using Python version >= Python3.7:
+Ensure you are using Python version >= Python3.8:
 
 ```sh
 python3 -V
@@ -234,7 +234,7 @@ See [here](#successful-message)
 
 ##### Step 0. Python version checking
 
-Ensure you are using Python version >= Python3.7:
+Ensure you are using Python version >= Python3.8:
 
 ```sh
 python3 -V
@@ -381,7 +381,7 @@ See [here](#existing-mnemonic-arguments) for `existing-mnemonic` arguments
 
 ##### Step 0. Python version checking
 
-Ensure you are using Python version >= Python3.7 (Assume that you've installed Python 3 as the main Python):
+Ensure you are using Python version >= Python3.8 (Assume that you've installed Python 3 as the main Python):
 
 ```sh
 python -V
@@ -443,7 +443,7 @@ See [here](#existing-mnemonic-arguments) for `existing-mnemonic` arguments
 
 ##### Step 0. Python version checking
 
-Ensure you are using Python version >= Python3.7 (Assume that you've installed Python 3 as the main Python):
+Ensure you are using Python version >= Python3.8 (Assume that you've installed Python 3 as the main Python):
 
 ```cmd
 python -V

diff --git a/build_configs/linux/requirements.txt b/build_configs/linux/requirements.txt
@@ -83,7 +83,7 @@ pyinstaller-hooks-contrib==2022.2 \
 importlib-metadata==4.11.3 \
     --hash=sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 \
     --hash=sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539
-zipp==3.7.0 \
+zipp==3.8.0 \
     --hash=sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d \
     --hash=sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375
 typing-extensions==4.1.1 \

diff --git a/build_configs/macos/requirements.txt b/build_configs/macos/requirements.txt
@@ -83,7 +83,7 @@ pyinstaller-hooks-contrib==2022.2 \
 importlib-metadata==4.11.3 \
     --hash=sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 \
     --hash=sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539
-zipp==3.7.0 \
+zipp==3.8.0 \
     --hash=sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d \
     --hash=sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375
 typing-extensions==4.1.1 \

diff --git a/build_configs/windows/requirements.txt b/build_configs/windows/requirements.txt
@@ -101,7 +101,7 @@ pyinstaller-hooks-contrib==2022.2 \
 importlib-metadata==4.11.3 \
     --hash=sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 \
     --hash=sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539
-zipp==3.7.0 \
+zipp==3.8.0 \
     --hash=sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d \
     --hash=sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375
 typing-extensions==4.1.1 \

diff --git a/requirements_test.txt b/requirements_test.txt
@@ -93,7 +93,7 @@ more-itertools==8.12.0 \
 py==1.11.0 \
     --hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 \
     --hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378
-zipp==3.7.0 \
+zipp==3.8.0 \
     --hash=sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d \
     --hash=sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375
 pyparsing==3.0.7 \

diff --git a/setup.py b/setup.py
@@ -9,5 +9,5 @@
     version='2.0.0',
     py_modules=["staking_deposit"],
     packages=find_packages(exclude=('tests', 'docs')),
-    python_requires=">=3.7,<4",
+    python_requires=">=3.8,<4",
 )
diff --git a/staking_deposit/intl/ar/deposit.json b/staking_deposit/intl/ar/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "إصدار بايثون الخاص بك غير كافٍ، يرجى تثبيت الإصدار 3.7 أو الأحدث."
+        "err_python_version": "إصدار بايثون الخاص بك غير كافٍ، يرجى تثبيت الإصدار 3.8 أو الأحدث."
     }
 }
diff --git a/staking_deposit/intl/el/deposit.json b/staking_deposit/intl/el/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "Η έκδοση python σας δεν είναι επαρκής, εγκαταστήστε την έκδοση 3.7 ή μεγαλύτερη."
+        "err_python_version": "Η έκδοση python σας δεν είναι επαρκής, εγκαταστήστε την έκδοση 3.8 ή μεγαλύτερη."
     }
 }
diff --git a/staking_deposit/intl/en/deposit.json b/staking_deposit/intl/en/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "Your python version is insufficient, please install version 3.7 or greater."
+        "err_python_version": "Your python version is insufficient, please install version 3.8 or greater."
     }
 }
diff --git a/staking_deposit/intl/fr/deposit.json b/staking_deposit/intl/fr/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "Votre version de Python est insuffisante. Veuillez installer la version 3.7 ou supérieure."
+        "err_python_version": "Votre version de Python est insuffisante. Veuillez installer la version 3.8 ou supérieure."
     }
 }
diff --git a/staking_deposit/intl/id/deposit.json b/staking_deposit/intl/id/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "Versi python Anda tidak cukup, harap instal versi 3.7 atau yang lebih baru."
+        "err_python_version": "Versi python Anda tidak cukup, harap instal versi 3.8 atau yang lebih baru."
     }
 }
diff --git a/staking_deposit/intl/it/deposit.json b/staking_deposit/intl/it/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "La tua versione di python non è sufficiente, installa la versione 3.7 o superiore."
+        "err_python_version": "La tua versione di python non è sufficiente, installa la versione 3.8 o superiore."
     }
 }
diff --git a/staking_deposit/intl/ja/deposit.json b/staking_deposit/intl/ja/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "Python のバージョンが最新ではありません。バージョン 3.7 以降をインストールしてください。"
+        "err_python_version": "Python のバージョンが最新ではありません。バージョン 3.8 以降をインストールしてください。"
     }
 }
diff --git a/staking_deposit/intl/ko/deposit.json b/staking_deposit/intl/ko/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "Python 버전이 너무 낮습니다. 3.7 이상 버전을 설치하세요."
+        "err_python_version": "Python 버전이 너무 낮습니다. 3.8 이상 버전을 설치하세요."
     }
 }
diff --git a/staking_deposit/intl/pt-BR/deposit.json b/staking_deposit/intl/pt-BR/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "Sua versão do python é insuficiente, por favor instale a versão 3.7 ou superior."
+        "err_python_version": "Sua versão do python é insuficiente, por favor instale a versão 3.8 ou superior."
     }
 }
diff --git a/staking_deposit/intl/ro/deposit.json b/staking_deposit/intl/ro/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "Versiunea de python este prea veche, te rugăm să instalezi versiunea 3.7 sau una mai recentă."
+        "err_python_version": "Versiunea de python este prea veche, te rugăm să instalezi versiunea 3.8 sau una mai recentă."
     }
 }
diff --git a/staking_deposit/intl/zh-CN/deposit.json b/staking_deposit/intl/zh-CN/deposit.json
@@ -1,5 +1,5 @@
 {
     "check_python_version": {
-        "err_python_version": "您的 python 版本不足，请安装 3.7 或以上版本。"
+        "err_python_version": "您的 python 版本不足，请安装 3.8 或以上版本。"
     }
 }
diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,14 @@
 [tox]
 envlist=
-    py{37,38}-core
-    py{37,38}-lint
-    py{37,38}-script
+    py{310,38}-core
+    py{310,38}-lint
+    py{310,38}-script
 
 [testenv]
 passenv=
     PYTEST_ADDOPTS
 basepython=
-    py37: python3.7
+    py310: python3.10
     py38: python3.8
 
 [common-install]
@@ -33,23 +33,23 @@ deps=
 commands=
     python {toxinidir}/test_deposit_script.py
 
-[testenv:py37-core]
+[testenv:py310-core]
 deps={[common-core]deps}
 commands={[common-core]commands}
 
 [testenv:py38-core]
 deps={[common-core]deps}
 commands={[common-core]commands}
 
-[testenv:py37-lint]
+[testenv:py310-lint]
 deps={[common-lint]deps}
 commands={[common-lint]commands}
 
 [testenv:py38-lint]
 deps={[common-lint]deps}
 commands={[common-lint]commands}
 
-[testenv:py37-script]
+[testenv:py310-script]
 deps={[common-script]deps}
 commands={[common-script]commands}