Add windows wheel CI jobs for py311 & py312

- linting

Author: fselmo

.circleci/config.yml

@@ -67,28 +67,51 @@ common: &common
 orbs:
   win: circleci/[email protected]
 
-windows_steps: &windows_steps
-  executor:
-    name: win/default
-    shell: bash.exe
-  working_directory: C:\Users\circleci\project\py-evm
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-    - run:
-        name: install dependencies
-        command: |
-          python -m pip install --upgrade pip
-          python -m pip install tox
-    - run:
-        name: run tox
-        command: python -m tox run -r
-    - save_cache:
-        paths:
-          - .tox
-        key: cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
+windows-wheel-steps:
+  windows-wheel-setup: &windows-wheel-setup
+    executor:
+      name: win/default
+      shell: bash.exe
+    working_directory: C:\Users\circleci\project\py-evm
+    environment:
+      TOXENV: windows-wheel
+  restore-cache-step: &restore-cache-step
+    restore_cache:
+      keys:
+        - cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
+  install-pyenv-step: &install-pyenv-step
+    run:
+      name: install pyenv
+      command: |
+        pip install pyenv-win --target $HOME/.pyenv
+        echo 'export PYENV="$HOME/.pyenv/pyenv-win/"' >> $BASH_ENV
+        echo 'export PYENV_ROOT="$HOME/.pyenv/pyenv-win/"' >> $BASH_ENV
+        echo 'export PYENV_USERPROFILE="$HOME/.pyenv/pyenv-win/"' >> $BASH_ENV
+        echo 'export PATH="$PATH:$HOME/.pyenv/pyenv-win/bin"' >> $BASH_ENV
+        echo 'export PATH="$PATH:$HOME/.pyenv/pyenv-win/shims"' >> $BASH_ENV
+        source $BASH_ENV
+        pyenv update
+  install-latest-python-step: &install-latest-python-step
+    run:
+      name: install latest python version and tox
+      command: |
+        LATEST_VERSION=$(pyenv install --list | grep -E "${MINOR_VERSION}\.[0-9]+$" | tail -1)
+        echo "installing python version $LATEST_VERSION"
+        pyenv install $LATEST_VERSION
+        pyenv global $LATEST_VERSION
+        python3 -m pip install --upgrade pip
+        python3 -m pip install tox
+  run-tox-step: &run-tox-step
+    run:
+      name: run tox
+      command: |
+        echo 'running tox with' $(python3 --version)
+        python3 -m tox run -r
+  save-cache-step: &save-cache-step
+    save_cache:
+      paths:
+        - .tox
+      key: cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
 
 docs: &docs
   docker:
@@ -364,6 +387,18 @@ jobs:
       - image: cimg/python:3.11
         environment:
           TOXENV: py311-wheel
+  py311-windows-wheel:
+    <<: *windows-wheel-setup
+    steps:
+      - checkout
+      - <<: *restore-cache-step
+      - <<: *install-pyenv-step
+      - run:
+          name: set minor version
+          command: echo "export MINOR_VERSION='3.11'" >> $BASH_ENV
+      - <<: *install-latest-python-step
+      - <<: *run-tox-step
+      - <<: *save-cache-step
 
   py312-core:
     <<: *common
@@ -407,10 +442,18 @@ jobs:
       - image: cimg/python:3.12
         environment:
           TOXENV: py312-wheel
-  py312-wheel-windows:
-    <<: *windows_steps
-    environment:
-      TOXENV: py312-wheel-windows
+  py312-windows-wheel:
+    <<: *windows-wheel-setup
+    steps:
+      - checkout
+      - <<: *restore-cache-step
+      - <<: *install-pyenv-step
+      - run:
+          name: set minor version
+          command: echo "export MINOR_VERSION='3.12'" >> $BASH_ENV
+      - <<: *install-latest-python-step
+      - <<: *run-tox-step
+      - <<: *save-cache-step
 
 workflows:
   version: 2
@@ -466,4 +509,5 @@ workflows:
       - py310-wheel
       - py311-wheel
       - py312-wheel
-      - py312-wheel-windows
+      - py311-windows-wheel
+      - py312-windows-wheel

eth/validation.py

@@ -179,7 +179,7 @@ def validate_unique(values: Iterable[Any], title: str = "Value") -> None:
         )
         raise ValidationError(
             f"{title} does not contain unique items.  Duplicates: "
-            f"{', '.join((str(value) for value in duplicates))}"
+            f"{', '.join(str(value) for value in duplicates)}"
         )
 
 

tox.ini

@@ -7,7 +7,7 @@ envlist=
     py{38,39,310,311,312}-transactions
     py{38,39,310,311,312}-vm
     py{38,39,310,311,312}-wheel
-    py312-wheel-windows
+    windows-wheel
     docs
     py312-native-blockchain-{ \
         metropolis, transition, frontier, homestead, tangerine_whistle, \
@@ -47,6 +47,7 @@ commands=
 
 basepython =
     docs: python
+    windows-wheel: python
     py38: python3.8
     py39: python3.9
     py310: python3.10
@@ -79,13 +80,14 @@ commands=
     python -c "import eth"
 skip_install=true
 
-[testenv:py312-wheel-windows]
+[testenv:windows-wheel]
 deps=
     wheel
     build[virtualenv]
 allowlist_externals=
     bash.exe
 commands=
+    python --version
     python -m pip install --upgrade pip
     bash.exe -c "rm -rf build dist"
     python -m build