Backport #1757 to the release branch and bring CI workflows in line w…

…ith main

.github/workflows/release-to-pypi.yml

@@ -27,19 +27,13 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.10'
 
     - name: Install Python packages needed for wheel build and upload
-      run: |
-        python -m pip install --upgrade pip setuptools
-        python -m pip install twine wheel
+      run: python -m pip install twine
 
     - name: Build wheels
-      uses: pypa/[email protected]
-      env:
-        CIBW_SKIP: 'pp*'
-        CIBW_ARCHS_LINUX: "auto aarch64"
-        CIBW_ARCHS_MACOS: "auto universal2"
+      uses: pypa/[email protected]
 
     - name: Check and upload wheels
       env:
@@ -60,21 +54,18 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.10'
 
     - name: Install Python packages needed for sdist build and upload
-      run: |
-        python -m pip install --upgrade pip setuptools
-        python -m pip install twine
+      run: python -m pip install build twine
 
     - name: Build sdist
-      run: |
-        python setup.py sdist
+      run: python -m build --sdist
 
     - name: Publish sdist to PyPI
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python -m twine check --strict dist/*.tar.gz
-        python -m twine upload dist/*.tar.gz
+        python -m twine check --strict dist/*
+        python -m twine upload dist/*

.github/workflows/run-core-traits-tests.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
 
     runs-on: ${{ matrix.os }}
 
@@ -21,9 +21,9 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Install local package
       run: |
-        python -m pip install --upgrade pip
         # Uninstall setuptools so that the tests will catch any accidental
         # dependence of the Traits source on setuptools. Note that in future
         # setuptools may not exist in a newly-created venv

.github/workflows/run-style-checks.yml

@@ -5,22 +5,16 @@ on:
 
 jobs:
   style:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ['3.8']
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: '3.10'
     - name: Install dependencies and local packages
       run: |
-        python -m pip install --upgrade pip
         python -m pip install flake8
         python -m pip install flake8-ets
     - name: Run style checks

.github/workflows/run-traits-tests.yml

@@ -5,7 +5,7 @@ on:
 - workflow_dispatch
 
 env:
-  # Temporary workaround prior to release of Traits 8.0
+  # Temporary workaround prior to release of TraitsUI 8.0
   # xref: enthought/traits#1742
   ETS_QT4_IMPORTS: 1
 
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
 
     runs-on: ${{ matrix.os }}
 
@@ -37,9 +37,9 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Install dependencies and local packages
       run: |
-        python -m pip install --upgrade pip
         python -m pip install .[test]
         python -m pip install traits-stubs/[test]
     - name: Create clean test directory

.github/workflows/test-documentation-build.yml

@@ -5,23 +5,16 @@ on:
 
 jobs:
   docs:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ['3.8']
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: '3.10'
     - name: Install dependencies and local packages
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install ".[docs]"
+      run: python -m pip install .[docs]
     - name: Build HTML documentation with Sphinx
       run: |
         cd docs

.github/workflows/test-from-pypi.yml

@@ -6,12 +6,17 @@ on:
     # Run at 03:27 UTC on the 8th and 22nd of every month
     - cron: '27 3 8,22 * *'
 
+env:
+  # Temporary workaround prior to release of Traits 8.0
+  # xref: enthought/traits#1742
+  ETS_QT4_IMPORTS: 1
+
 jobs:
   test-pypi-sdist:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         python-architecture: [x86, x64]
         exclude:
         - os: macos-latest
@@ -40,6 +45,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.python-architecture }}
+        allow-prereleases: true
     - name: Install prerequisites
       run: |
         python -m pip install --upgrade pip setuptools wheel

pyproject.toml

@@ -11,5 +11,14 @@ profile = 'black'
 line_length = 79
 order_by_type = 'False'
 
+[tool.cibuildwheel]
+skip = 'pp*'
+
+[tool.cibuildwheel.macos]
+archs = ['auto', 'universal2']
+
+[tool.cibuildwheel.linux]
+archs = ['auto', 'aarch64']
+
 [tool.pytest.ini_options]
 addopts = '--ignore=traits-stubs'