Bring CI back to working state

enthought · Jul 26, 2023 · f0fdb86 · f0fdb86
1 parent 7c9a71e
commit f0fdb86
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 55 deletions.
diff --git a/.github/workflows/release-to-pypi.yml b/.github/workflows/release-to-pypi.yml
@@ -16,16 +16,16 @@ jobs:
     steps:
 
     - name: Check out the release commit
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         platforms: arm64
       if: runner.os == 'Linux'
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.8'
 
@@ -35,7 +35,7 @@ jobs:
         python -m pip install twine wheel
 
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.9.0
+      uses: pypa/cibuildwheel@v2.14.1
       env:
         CIBW_SKIP: 'pp*'
         CIBW_ARCHS_LINUX: "auto aarch64"
@@ -55,10 +55,10 @@ jobs:
     steps:
 
     - name: Check out the release commit
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.8'
 

diff --git a/.github/workflows/run-core-traits-tests.yml b/.github/workflows/run-core-traits-tests.yml
@@ -11,14 +11,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-dev']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install local package

diff --git a/.github/workflows/run-style-checks.yml b/.github/workflows/run-style-checks.yml
@@ -13,9 +13,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies and local packages

diff --git a/.github/workflows/run-traits-tests.yml b/.github/workflows/run-traits-tests.yml
@@ -4,31 +4,37 @@ on:
 - pull_request
 - workflow_dispatch
 
+env:
+  # Temporary workaround prior to release of Traits 8.0
+  # xref: enthought/traits#1742
+  ETS_QT4_IMPORTS: 1
+
 jobs:
   tests:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-dev']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Install Linux packages for Qt 5 support
+    - uses: actions/checkout@v3
+    - name: Install Linux packages for Qt support
       run: |
         sudo apt-get update
-        sudo apt-get install qt5-default
+        sudo apt-get install libegl1
         sudo apt-get install libxkbcommon-x11-0
+        sudo apt-get install libxcb-cursor0
         sudo apt-get install libxcb-icccm4
         sudo apt-get install libxcb-image0
         sudo apt-get install libxcb-keysyms1
         sudo apt-get install libxcb-randr0
         sudo apt-get install libxcb-render-util0
-        sudo apt-get install libxcb-xinerama0
+        sudo apt-get install libxcb-shape0
       if: matrix.os == 'ubuntu-latest'
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies and local packages
@@ -39,13 +45,15 @@ jobs:
     - name: Create clean test directory
       run: |
         mkdir testdir
-    - name: Test Traits package
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        working-directory: testdir
-        run: python -m unittest discover -v traits
-    - name: Test Traits typing stubs
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        working-directory: testdir
-        run: python -m unittest discover -v traits_stubs_tests
+    - name: Test Traits package (Linux)
+      run: cd testdir && xvfb-run -a python -m unittest discover -v traits
+      if: matrix.os == 'ubuntu-latest'
+    - name: Test Traits package (Windows/macOS)
+      run: cd testdir && python -m unittest discover -v traits
+      if: matrix.os != 'ubuntu-latest'
+    - name: Test Traits typing stubs (Linux)
+      run: cd testdir && xvfb-run -a python -m unittest discover -v traits_stubs_tests
+      if: matrix.os == 'ubuntu-latest'
+    - name: Test Traits typing stubs (Windows/macOS)
+      run: cd testdir && python -m unittest discover -v traits_stubs_tests
+      if: matrix.os != 'ubuntu-latest'
diff --git a/.github/workflows/test-documentation-build.yml b/.github/workflows/test-documentation-build.yml
@@ -13,16 +13,15 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies and local packages
       run: |
         python -m pip install --upgrade pip
-        python -m pip install Sphinx enthought_sphinx_theme sphinx-copybutton
-        python -m pip install .
+        python -m pip install ".[docs]"
     - name: Build HTML documentation with Sphinx
       run: |
         cd docs

diff --git a/.github/workflows/test-from-pypi.yml b/.github/workflows/test-from-pypi.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-dev']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         python-architecture: [x86, x64]
         exclude:
         - os: macos-latest
@@ -22,20 +22,21 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - name: Install Linux packages for Qt 5 support
+    - name: Install Linux packages for Qt support
       run: |
         sudo apt-get update
-        sudo apt-get install qt5-default
+        sudo apt-get install libegl1
         sudo apt-get install libxkbcommon-x11-0
+        sudo apt-get install libxcb-cursor0
         sudo apt-get install libxcb-icccm4
         sudo apt-get install libxcb-image0
         sudo apt-get install libxcb-keysyms1
         sudo apt-get install libxcb-randr0
         sudo apt-get install libxcb-render-util0
-        sudo apt-get install libxcb-xinerama0
+        sudo apt-get install libxcb-shape0
       if: runner.os == 'Linux'
     - name: Set up Python ${{ matrix.python-version }} (${{ matrix.python-architecture }})
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.python-architecture }}
@@ -48,17 +49,18 @@ jobs:
     - name: Create clean test directory
       run: |
         mkdir testdir
-    - name: Test Traits package
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        working-directory: testdir
-        run: python -m unittest discover -v traits
+    - name: Test Traits package (Linux)
+      run: cd testdir && xvfb-run -a python -m unittest discover -v traits
+      if: matrix.os == 'ubuntu-latest'
+    - name: Test Traits package (Windows/macOS)
+      run: cd testdir && python -m unittest discover -v traits
+      if: matrix.os != 'ubuntu-latest'
 
   test-pypi-wheel:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         python-architecture: [x86, x64]
         exclude:
         - os: macos-latest
@@ -69,20 +71,21 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - name: Install Linux packages for Qt 5 support
+    - name: Install Linux packages for Qt support
       run: |
         sudo apt-get update
-        sudo apt-get install qt5-default
+        sudo apt-get install libegl1
         sudo apt-get install libxkbcommon-x11-0
+        sudo apt-get install libxcb-cursor0
         sudo apt-get install libxcb-icccm4
         sudo apt-get install libxcb-image0
         sudo apt-get install libxcb-keysyms1
         sudo apt-get install libxcb-randr0
         sudo apt-get install libxcb-render-util0
-        sudo apt-get install libxcb-xinerama0
+        sudo apt-get install libxcb-shape0
       if: runner.os == 'Linux'
     - name: Set up Python ${{ matrix.python-version }} (${{ matrix.python-architecture }})
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.python-architecture }}
@@ -95,11 +98,12 @@ jobs:
     - name: Create clean test directory
       run: |
         mkdir testdir
-    - name: Test Traits package
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        working-directory: testdir
-        run: python -m unittest discover -v traits
+    - name: Test Traits package (Linux)
+      run: cd testdir && xvfb-run -a python -m unittest discover -v traits
+      if: matrix.os == 'ubuntu-latest'
+    - name: Test Traits package (Windows/macOS)
+      run: cd testdir && python -m unittest discover -v traits
+      if: matrix.os != 'ubuntu-latest'
 
   notify-on-failure:
     needs: [test-pypi-sdist, test-pypi-wheel]

diff --git a/setup.py b/setup.py
@@ -303,7 +303,10 @@ def get_long_description():
     extras_require={
         "docs": [
             "enthought-sphinx-theme",
-            "Sphinx>=2.1.0",
+            # Doc builds are hanging with pygments 2.15.0 and 2.15.1.
+            # Maybe related: https://github.com/pygments/pygments/issues/2427
+            "pygments<2.15",
+            "Sphinx",
             "sphinx-copybutton",
         ],
         "test": [
@@ -313,10 +316,12 @@ def get_long_description():
             "mypy",
             "numpy",
             "pyface",
-            "PySide2; python_version < '3.8'",
-            "PySide6; python_version >= '3.8' and python_version < '3.11'",
+            # Doc builds are hanging with pygments 2.15.0 and 2.15.1.
+            # Maybe related: https://github.com/pygments/pygments/issues/2427
+            "pygments<2.15",
+            "PySide6; python_version >= '3.7' and python_version < '3.12'",
             "setuptools",
-            "Sphinx>=2.1.0",
+            "Sphinx",
             "traitsui",
         ],
         "examples": [