Traits 6.4.2 bugfix release (#1752)

This PR (against the maint/6.4 branch) is aimed at a 6.4.2 bugfix release. Key changes: - Backport PR #1746 - Backport PR #1749 - Update copyright headers and bring CI back to working state - Update changelog, bump version for release. The PR is pretty horrendous to review en masse thanks to the changelog updates, but it should be possible to review it commit by commit. @corranwebster Would you have bandwidth for review at some point? (Feel free to unassign if not.) --------- Co-authored-by: homosapien-lcy <102019577+homosapien-lcy@users.noreply.github.com>
enthought · Aug 7, 2023 · 93583b9 · 93583b9
1 parent 7237633
commit 93583b9
Show file tree

Hide file tree

Showing 369 changed files with 461 additions and 515 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/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,21 @@
 Traits CHANGELOG
 ================
 
+Release 6.4.2
+-------------
+
+Released: 2023-08-07
+
+This is a bugfix release that fixes failing some test failures with the
+most recent TraitsUI versions.
+
+Fixes
+~~~~~
+* Replace a deprecated version check for TraitsUI. (#1746)
+* Fix a test that fails on warnings other than those directly related to
+  the test purpose. (#1749)
+
+
 Release 6.4.1
 -------------
 

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,7 @@
 This software is OSI Certified Open Source Software.
 OSI Certified is a certification mark of the Open Source Initiative.
 
-(C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+(C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.rst b/README.rst
@@ -40,7 +40,7 @@ inherited by any subclass derived from the class.
 Dependencies
 ------------
 
-Traits requires Python >= 3.6.
+Traits requires Python >= 3.7.
 
 Traits has the following optional dependencies:
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD
@@ -62,7 +62,7 @@
 # General substitutions.
 project = "traits"
 copyright = """\
-(C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+(C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 All rights reserved.
 """
 

diff --git a/docs/source/traits_user_manual/index.rst b/docs/source/traits_user_manual/index.rst
@@ -3,7 +3,7 @@ Traits |version| User Manual
 ============================
 
 :Authors: David C. Morrill, Janet M. Swisher, and Enthought developers
-:Copyright: | (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+:Copyright: | (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
             | All rights reserved.
 
 Contents

diff --git a/etstool.py b/etstool.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD
@@ -51,7 +51,7 @@
 
     python etstool.py test-all
 
-Currently supported runtime values are ``3.6``.  Not all
+The only currently supported runtime values is ``3.8``.  Not all
 combinations of runtimes will work, but the tasks will fail with
 a clear error if that is the case.
 
@@ -101,7 +101,6 @@
 
 # Dependencies on the Python runtime.
 runtime_dependencies = {
-    "3.6": {"pyqt5", "lark_parser", "mypy"},
     "3.8": {"pyside6"},
 }
 
@@ -118,7 +117,7 @@
     "gnureadline",
 }
 
-supported_runtimes = ["3.6", "3.8"]
+supported_runtimes = ["3.8"]
 default_runtime = "3.8"
 
 github_url_fmt = "git+http://github.com/enthought/{0}.git#egg={0}"

diff --git a/examples/tutorials/doc_examples/__init__.py b/examples/tutorials/doc_examples/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/examples/tutorials/doc_examples/examples/__init__.py b/examples/tutorials/doc_examples/examples/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/examples/tutorials/doc_examples/examples/adapt_metadata.py b/examples/tutorials/doc_examples/examples/adapt_metadata.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/examples/tutorials/doc_examples/examples/add_class_trait.py b/examples/tutorials/doc_examples/examples/add_class_trait.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/examples/tutorials/doc_examples/examples/all_traits_features.py b/examples/tutorials/doc_examples/examples/all_traits_features.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/examples/tutorials/doc_examples/examples/all_wildcard.py b/examples/tutorials/doc_examples/examples/all_wildcard.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD