Skip to content

Commit 93583b9

Browse files
mdickinsonhomosapien-lcy
mdickinson
and
homosapien-lcy
authored
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 <[email protected]>
1 parent 7237633 commit 93583b9

File tree

369 files changed

+461
-515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+461
-515
lines changed

Diff for: ‎.github/workflows/release-to-pypi.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ jobs:
1616
steps:
1717

1818
- name: Check out the release commit
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020

2121
- name: Set up QEMU
22-
uses: docker/setup-qemu-action@v1
22+
uses: docker/setup-qemu-action@v2
2323
with:
2424
platforms: arm64
2525
if: runner.os == 'Linux'
2626

2727
- name: Set up Python
28-
uses: actions/setup-python@v2
28+
uses: actions/setup-python@v4
2929
with:
3030
python-version: '3.8'
3131

@@ -35,7 +35,7 @@ jobs:
3535
python -m pip install twine wheel
3636
3737
- name: Build wheels
38-
uses: pypa/cibuildwheel@v2.9.0
38+
uses: pypa/cibuildwheel@v2.14.1
3939
env:
4040
CIBW_SKIP: 'pp*'
4141
CIBW_ARCHS_LINUX: "auto aarch64"
@@ -55,10 +55,10 @@ jobs:
5555
steps:
5656

5757
- name: Check out the release commit
58-
uses: actions/checkout@v2
58+
uses: actions/checkout@v3
5959

6060
- name: Set up Python
61-
uses: actions/setup-python@v2
61+
uses: actions/setup-python@v4
6262
with:
6363
python-version: '3.8'
6464

Diff for: ‎.github/workflows/run-core-traits-tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-latest, windows-latest]
14-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-dev']
14+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
1515

1616
runs-on: ${{ matrix.os }}
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v2
21+
uses: actions/setup-python@v4
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
- name: Install local package

Diff for: ‎.github/workflows/run-style-checks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v4
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies and local packages

Diff for: ‎.github/workflows/run-traits-tests.yml

+24-16
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,37 @@ on:
44
- pull_request
55
- workflow_dispatch
66

7+
env:
8+
# Temporary workaround prior to release of Traits 8.0
9+
# xref: enthought/traits#1742
10+
ETS_QT4_IMPORTS: 1
11+
712
jobs:
813
tests:
914
strategy:
1015
matrix:
1116
os: [ubuntu-latest, windows-latest, macos-latest]
12-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-dev']
17+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
1318

1419
runs-on: ${{ matrix.os }}
1520

1621
steps:
17-
- uses: actions/checkout@v2
18-
- name: Install Linux packages for Qt 5 support
22+
- uses: actions/checkout@v3
23+
- name: Install Linux packages for Qt support
1924
run: |
2025
sudo apt-get update
21-
sudo apt-get install qt5-default
26+
sudo apt-get install libegl1
2227
sudo apt-get install libxkbcommon-x11-0
28+
sudo apt-get install libxcb-cursor0
2329
sudo apt-get install libxcb-icccm4
2430
sudo apt-get install libxcb-image0
2531
sudo apt-get install libxcb-keysyms1
2632
sudo apt-get install libxcb-randr0
2733
sudo apt-get install libxcb-render-util0
28-
sudo apt-get install libxcb-xinerama0
34+
sudo apt-get install libxcb-shape0
2935
if: matrix.os == 'ubuntu-latest'
3036
- name: Set up Python ${{ matrix.python-version }}
31-
uses: actions/setup-python@v2
37+
uses: actions/setup-python@v4
3238
with:
3339
python-version: ${{ matrix.python-version }}
3440
- name: Install dependencies and local packages
@@ -39,13 +45,15 @@ jobs:
3945
- name: Create clean test directory
4046
run: |
4147
mkdir testdir
42-
- name: Test Traits package
43-
uses: GabrielBB/xvfb-action@v1
44-
with:
45-
working-directory: testdir
46-
run: python -m unittest discover -v traits
47-
- name: Test Traits typing stubs
48-
uses: GabrielBB/xvfb-action@v1
49-
with:
50-
working-directory: testdir
51-
run: python -m unittest discover -v traits_stubs_tests
48+
- name: Test Traits package (Linux)
49+
run: cd testdir && xvfb-run -a python -m unittest discover -v traits
50+
if: matrix.os == 'ubuntu-latest'
51+
- name: Test Traits package (Windows/macOS)
52+
run: cd testdir && python -m unittest discover -v traits
53+
if: matrix.os != 'ubuntu-latest'
54+
- name: Test Traits typing stubs (Linux)
55+
run: cd testdir && xvfb-run -a python -m unittest discover -v traits_stubs_tests
56+
if: matrix.os == 'ubuntu-latest'
57+
- name: Test Traits typing stubs (Windows/macOS)
58+
run: cd testdir && python -m unittest discover -v traits_stubs_tests
59+
if: matrix.os != 'ubuntu-latest'

Diff for: ‎.github/workflows/test-documentation-build.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v4
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies and local packages
2222
run: |
2323
python -m pip install --upgrade pip
24-
python -m pip install Sphinx enthought_sphinx_theme sphinx-copybutton
25-
python -m pip install .
24+
python -m pip install ".[docs]"
2625
- name: Build HTML documentation with Sphinx
2726
run: |
2827
cd docs

Diff for: ‎.github/workflows/test-from-pypi.yml

+24-20
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-latest, windows-latest, macos-latest]
14-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-dev']
14+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
1515
python-architecture: [x86, x64]
1616
exclude:
1717
- os: macos-latest
@@ -22,20 +22,21 @@ jobs:
2222
runs-on: ${{ matrix.os }}
2323

2424
steps:
25-
- name: Install Linux packages for Qt 5 support
25+
- name: Install Linux packages for Qt support
2626
run: |
2727
sudo apt-get update
28-
sudo apt-get install qt5-default
28+
sudo apt-get install libegl1
2929
sudo apt-get install libxkbcommon-x11-0
30+
sudo apt-get install libxcb-cursor0
3031
sudo apt-get install libxcb-icccm4
3132
sudo apt-get install libxcb-image0
3233
sudo apt-get install libxcb-keysyms1
3334
sudo apt-get install libxcb-randr0
3435
sudo apt-get install libxcb-render-util0
35-
sudo apt-get install libxcb-xinerama0
36+
sudo apt-get install libxcb-shape0
3637
if: runner.os == 'Linux'
3738
- name: Set up Python ${{ matrix.python-version }} (${{ matrix.python-architecture }})
38-
uses: actions/setup-python@v2
39+
uses: actions/setup-python@v4
3940
with:
4041
python-version: ${{ matrix.python-version }}
4142
architecture: ${{ matrix.python-architecture }}
@@ -48,17 +49,18 @@ jobs:
4849
- name: Create clean test directory
4950
run: |
5051
mkdir testdir
51-
- name: Test Traits package
52-
uses: GabrielBB/xvfb-action@v1
53-
with:
54-
working-directory: testdir
55-
run: python -m unittest discover -v traits
52+
- name: Test Traits package (Linux)
53+
run: cd testdir && xvfb-run -a python -m unittest discover -v traits
54+
if: matrix.os == 'ubuntu-latest'
55+
- name: Test Traits package (Windows/macOS)
56+
run: cd testdir && python -m unittest discover -v traits
57+
if: matrix.os != 'ubuntu-latest'
5658

5759
test-pypi-wheel:
5860
strategy:
5961
matrix:
6062
os: [ubuntu-latest, windows-latest, macos-latest]
61-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
63+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
6264
python-architecture: [x86, x64]
6365
exclude:
6466
- os: macos-latest
@@ -69,20 +71,21 @@ jobs:
6971
runs-on: ${{ matrix.os }}
7072

7173
steps:
72-
- name: Install Linux packages for Qt 5 support
74+
- name: Install Linux packages for Qt support
7375
run: |
7476
sudo apt-get update
75-
sudo apt-get install qt5-default
77+
sudo apt-get install libegl1
7678
sudo apt-get install libxkbcommon-x11-0
79+
sudo apt-get install libxcb-cursor0
7780
sudo apt-get install libxcb-icccm4
7881
sudo apt-get install libxcb-image0
7982
sudo apt-get install libxcb-keysyms1
8083
sudo apt-get install libxcb-randr0
8184
sudo apt-get install libxcb-render-util0
82-
sudo apt-get install libxcb-xinerama0
85+
sudo apt-get install libxcb-shape0
8386
if: runner.os == 'Linux'
8487
- name: Set up Python ${{ matrix.python-version }} (${{ matrix.python-architecture }})
85-
uses: actions/setup-python@v2
88+
uses: actions/setup-python@v4
8689
with:
8790
python-version: ${{ matrix.python-version }}
8891
architecture: ${{ matrix.python-architecture }}
@@ -95,11 +98,12 @@ jobs:
9598
- name: Create clean test directory
9699
run: |
97100
mkdir testdir
98-
- name: Test Traits package
99-
uses: GabrielBB/xvfb-action@v1
100-
with:
101-
working-directory: testdir
102-
run: python -m unittest discover -v traits
101+
- name: Test Traits package (Linux)
102+
run: cd testdir && xvfb-run -a python -m unittest discover -v traits
103+
if: matrix.os == 'ubuntu-latest'
104+
- name: Test Traits package (Windows/macOS)
105+
run: cd testdir && python -m unittest discover -v traits
106+
if: matrix.os != 'ubuntu-latest'
103107

104108
notify-on-failure:
105109
needs: [test-pypi-sdist, test-pypi-wheel]

Diff for: ‎CHANGES.rst

+15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
Traits CHANGELOG
22
================
33

4+
Release 6.4.2
5+
-------------
6+
7+
Released: 2023-08-07
8+
9+
This is a bugfix release that fixes failing some test failures with the
10+
most recent TraitsUI versions.
11+
12+
Fixes
13+
~~~~~
14+
* Replace a deprecated version check for TraitsUI. (#1746)
15+
* Fix a test that fails on warnings other than those directly related to
16+
the test purpose. (#1749)
17+
18+
419
Release 6.4.1
520
-------------
621

Diff for: ‎LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
This software is OSI Certified Open Source Software.
22
OSI Certified is a certification mark of the Open Source Initiative.
33

4-
(C) Copyright 2005-2022 Enthought, Inc., Austin, TX
4+
(C) Copyright 2005-2023 Enthought, Inc., Austin, TX
55
All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without

Diff for: ‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ inherited by any subclass derived from the class.
4040
Dependencies
4141
------------
4242

43-
Traits requires Python >= 3.6.
43+
Traits requires Python >= 3.7.
4444

4545
Traits has the following optional dependencies:
4646

Diff for: ‎docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD
@@ -62,7 +62,7 @@
6262
# General substitutions.
6363
project = "traits"
6464
copyright = """\
65-
(C) Copyright 2005-2022 Enthought, Inc., Austin, TX
65+
(C) Copyright 2005-2023 Enthought, Inc., Austin, TX
6666
All rights reserved.
6767
"""
6868

Diff for: ‎docs/source/traits_user_manual/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Traits |version| User Manual
33
============================
44

55
:Authors: David C. Morrill, Janet M. Swisher, and Enthought developers
6-
:Copyright: | (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
6+
:Copyright: | (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
77
| All rights reserved.
88
99
Contents

Diff for: ‎etstool.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD
@@ -51,7 +51,7 @@
5151
5252
python etstool.py test-all
5353
54-
Currently supported runtime values are ``3.6``. Not all
54+
The only currently supported runtime values is ``3.8``. Not all
5555
combinations of runtimes will work, but the tasks will fail with
5656
a clear error if that is the case.
5757
@@ -101,7 +101,6 @@
101101

102102
# Dependencies on the Python runtime.
103103
runtime_dependencies = {
104-
"3.6": {"pyqt5", "lark_parser", "mypy"},
105104
"3.8": {"pyside6"},
106105
}
107106

@@ -118,7 +117,7 @@
118117
"gnureadline",
119118
}
120119

121-
supported_runtimes = ["3.6", "3.8"]
120+
supported_runtimes = ["3.8"]
122121
default_runtime = "3.8"
123122

124123
github_url_fmt = "git+http://github.com/enthought/{0}.git#egg={0}"

Diff for: ‎examples/tutorials/doc_examples/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

Diff for: ‎examples/tutorials/doc_examples/examples/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

Diff for: ‎examples/tutorials/doc_examples/examples/adapt_metadata.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

Diff for: ‎examples/tutorials/doc_examples/examples/add_class_trait.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

Diff for: ‎examples/tutorials/doc_examples/examples/all_traits_features.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

Diff for: ‎examples/tutorials/doc_examples/examples/all_wildcard.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2005-2022 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

0 commit comments

Comments
 (0)