Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/actions/install-qt-support/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ runs:
sudo apt-get install libxcb-shape0
# Needed to work around https://bugreports.qt.io/browse/PYSIDE-1547
sudo apt-get install libopengl0
# Required by Qt 6.5+
sudo apt-get install libxcb-cursor0
shell: bash
10 changes: 7 additions & 3 deletions .github/workflows/ets-from-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- cron: '0 0 * * 5'

env:
INSTALL_EDM_VERSION: 3.4.0
INSTALL_EDM_VERSION: 4.1.3
QT_MAC_WANTS_LAYER: 1

jobs:
Expand All @@ -18,8 +18,12 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
runtime: ['3.8']
runtime: ['3.8', '3.11']
toolkit: ['null', 'pyside6']
exclude:
# EDM does not provide a Python 3.8 runtime for ARM (osx_arm64).
- os: macos-latest
runtime: '3.8'

runs-on: ${{ matrix.os }}
steps:
Expand All @@ -33,7 +37,7 @@ jobs:
path: ~/.cache
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
- name: Set up EDM
uses: enthought/setup-edm-action@v4
uses: enthought/setup-edm-action@v4.1
with:
edm-version: ${{ env.INSTALL_EDM_VERSION }}
- name: Set up bootstrap Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-on-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: '3.10'
python-version: '3.14'
- name: Install Python packages needed for build and upload
run: |
python -m pip install build twine
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.11'
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'docs/requirements.txt'
- run: |
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/test-with-edm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Test with EDM
on: [pull_request, workflow_dispatch]

env:
INSTALL_EDM_VERSION: 3.4.0
INSTALL_EDM_VERSION: 4.1.3
QT_MAC_WANTS_LAYER: 1

jobs:
Expand All @@ -17,8 +17,12 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
runtime: ['3.8']
runtime: ['3.8', '3.11']
toolkit: ['null', 'pyside6']
exclude:
# EDM does not provide a Python 3.8 runtime for ARM (osx_arm64).
- os: macos-latest
runtime: '3.8'

runs-on: ${{ matrix.os }}
steps:
Expand All @@ -32,7 +36,7 @@ jobs:
path: ~/.cache
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
- name: Set up EDM
uses: enthought/setup-edm-action@v4
uses: enthought/setup-edm-action@v4.1
with:
edm-version: ${{ env.INSTALL_EDM_VERSION }}
- name: Set up bootstrap Python
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test-with-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest']
python-version: ['3.8', '3.10', '3.11']
python-version: ['3.8', '3.10', '3.11', '3.12', '3.13', '3.14']

runs-on: ${{ matrix.os }}
steps:
Expand All @@ -27,9 +27,7 @@ jobs:
- name: Install packages needed for testing
run: python -m pip install pytest
- name: Install toolkit
# See https://github.com/enthought/envisage/issues/528 for restrictions
run: python -m pip install 'pyside6<6.4'
if: matrix.python-version != '3.11'
run: python -m pip install pyside6
- name: Install package under test
run: python -m pip install .
- name: List installed packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-gh-pages-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.11'
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'docs/requirements.txt'
- run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.11'
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'docs/requirements.txt'
- run: |
Expand Down
6 changes: 3 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Requirements for building documentation
Sphinx==6.1.3
enthought-sphinx-theme==0.7.2
sphinx-copybutton==0.5.1
Sphinx==9.1.0
enthought-sphinx-theme==0.7.4
sphinx-copybutton==0.5.2
22 changes: 19 additions & 3 deletions etstool.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
import click

# Python runtime versions supported by this tool.
available_runtimes = ["3.8"]
available_runtimes = ["3.8", "3.11"]

# Python runtime used by default.
default_runtime = "3.8"
Expand All @@ -100,6 +100,14 @@

supported_combinations = {
"3.8": {"null", "pyqt6", "pyside6"},
"3.11": {"null", "pyqt6", "pyside6"},
}

# On Linux, EDM requires an explicit platform string that depends on the
# runtime: Python 3.8 uses rh7_x86_64 and Python 3.11 uses rh8_x86_64.
linux_runtime_platform = {
"3.8": "rh7_x86_64",
"3.11": "rh8_x86_64",
}

dependencies = {
Expand All @@ -109,7 +117,6 @@
"enthought_sphinx_theme",
"pyface",
"sphinx",
"sphinx_copybutton",
"traits",
"traitsui",
}
Expand All @@ -122,6 +129,8 @@
"flake8",
"flake8-ets",
"isort",
# sphinx_copybutton is not available in EDM for all runtimes
"sphinx-copybutton",
}

# Dependencies we install from source for cron tests
Expand Down Expand Up @@ -218,9 +227,16 @@ def install(edm, runtime, toolkit, environment, editable, source):
| toolkit_dependencies.get(toolkit, set())
| runtime_dependencies.get(runtime, set())
)
# On Linux, the EDM platform must be specified explicitly since the
# default (rh8_x86_64) only supports newer runtimes.
if sys.platform.startswith("linux") and runtime in linux_runtime_platform:
platform_flag = " --platform=" + linux_runtime_platform[runtime]
else:
platform_flag = ""
# edm commands to setup the development environment
commands = [
"{edm} environments create {environment} --force --version={runtime}",
"{edm} environments create {environment} --force --version={runtime}"
+ platform_flag,
"{edm} --config edm.yaml install -y -e {environment} " + packages,
]
commands.extend(
Expand Down