Merge branch 'main' into add-3.12.x

pyca · Oct 5, 2023 · b2fdff3 · b2fdff3
2 parents e5803da + 3ff83ce
commit b2fdff3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,19 +14,20 @@ jobs:
     strategy:
       matrix:
         PYTHON:
-          - {VERSION: "3.11", TOXENV: "docs", COVERAGE: "false"}
-          - {VERSION: "3.11", TOXENV: "meta", COVERAGE: "false"}
-          - {VERSION: "3.11", TOXENV: "mypy", COVERAGE: "false"}
-          - {VERSION: "pypy-3.7", TOXENV: "pypy"}
+          - {VERSION: "3.12", TOXENV: "docs", COVERAGE: "false"}
+          - {VERSION: "3.12", TOXENV: "meta", COVERAGE: "false"}
+          - {VERSION: "3.12", TOXENV: "mypy", COVERAGE: "false"}
+          - {VERSION: "pypy-3.9", TOXENV: "pypy3"}
+          - {VERSION: "pypy-3.10", TOXENV: "pypy3"}
           - {VERSION: "3.6", TOXENV: "py36"}
           - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.8", TOXENV: "py38"}
           - {VERSION: "3.9", TOXENV: "py39"}
           - {VERSION: "3.10", TOXENV: "py310"}
           - {VERSION: "3.11", TOXENV: "py311"}
           - {VERSION: "3.12", TOXENV: "py312"}
-          - {VERSION: "3.11", TOXENV: "py311", NOTE: "system", SODIUM_INSTALL: "system"}
-          - {VERSION: "3.11", TOXENV: "py311", NOTE: "minimal", SODIUM_INSTALL_MINIMAL: "1"}
+          - {VERSION: "3.12", TOXENV: "py312", NOTE: "system", SODIUM_INSTALL: "system"}
+          - {VERSION: "3.12", TOXENV: "py312", NOTE: "minimal", SODIUM_INSTALL_MINIMAL: "1"}
     name: "Linux ${{ matrix.PYTHON.TOXENV }} ${{ matrix.PYTHON.NOTE }}"
     steps:
       - uses: actions/checkout@v3.6.0
@@ -69,8 +70,8 @@ jobs:
       matrix:
         PYTHON:
           - {VERSION: "3.6", TOXENV: "py36"}
-          - {VERSION: "3.11", TOXENV: "py311"}
-          - {VERSION: "3.11", TOXENV: "py311", NOTE: " (minimal build)", SODIUM_INSTALL_MINIMAL: "1"}
+          - {VERSION: "3.12", TOXENV: "py312"}
+          - {VERSION: "3.12", TOXENV: "py312", NOTE: " (minimal build)", SODIUM_INSTALL_MINIMAL: "1"}
     name: "Python ${{ matrix.PYTHON.VERSION }}${{ matrix.PYTHON.NOTE }} on macOS"
     steps:
       - uses: actions/checkout@v3.6.0

diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml
@@ -10,6 +10,12 @@ on:
   push:
     tags:
       - '*.*.*'
+  pull_request:
+    paths:
+      - .github/workflows/wheel-builder.yml
+      - pyproject.toml
+      - setup.cfg
+      - setup.py
 
 jobs:
   manylinux:

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{py,36,37,38,39,310,311,312},docs,meta,mypy
+envlist = py{py3,36,37,38,39,310,311,312},docs,meta,mypy
 isolated_build = True
 
 [testenv]