Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c1f14dd
Remove etstool.py, and use uv in the workflows that don't use EDM
mdickinson Aug 5, 2026
3961668
Use uv natively: dependency groups instead of uv pip
mdickinson Aug 5, 2026
3871cd7
Set the uv Python version via setup-uv rather than UV_PYTHON
mdickinson Aug 5, 2026
e93c5cb
Add a dev dependency group composing style and test
mdickinson Aug 5, 2026
ec7d660
Merge remote-tracking branch 'origin/main' into remove-etstool
mdickinson Aug 5, 2026
93bce6f
Fix ets-from-source on Windows, and use uv run -m
mdickinson Aug 5, 2026
1e10cdb
Run everything through uv run in AGENTS.md
mdickinson Aug 5, 2026
0e2f182
Give each uv cache its own key via cache-suffix
mdickinson Aug 5, 2026
47c43df
Ask each job for the dependency groups it actually needs
mdickinson Aug 5, 2026
513ff89
Name the uv tree step for what it does
mdickinson Aug 5, 2026
9791a6b
Don't ignore .venv explicitly
mdickinson Aug 5, 2026
fa4df17
Drop the comment on the dev group
mdickinson Aug 5, 2026
1e2b5b0
Fold the test group into dev
mdickinson Aug 5, 2026
122e98e
Merge remote-tracking branch 'origin/main' into remove-etstool
mdickinson Aug 6, 2026
0279196
Re-file the #628 changelog entries under 8.1.0
mdickinson Aug 6, 2026
89d4672
Add a Released placeholder to the 8.1.0 section
mdickinson Aug 6, 2026
eb54afd
Remove .coveragerc
mdickinson Aug 6, 2026
696ec50
Build with uv_build instead of setuptools
mdickinson Aug 6, 2026
c00e975
Trim the two long pyproject.toml comments to one line each
mdickinson Aug 6, 2026
930fb2e
Track uv.lock, and install from it in CI
mdickinson Aug 6, 2026
8d5668f
Have dependabot keep uv.lock up to date
mdickinson Aug 6, 2026
290e4b7
Drop test-with-latest in favour of dependabot
mdickinson Aug 6, 2026
54fe619
Keep the two tool.uv tables together
mdickinson Aug 6, 2026
542d1a7
Stop shipping CHANGES.rst in the source distribution
mdickinson Aug 6, 2026
ede6252
Fix the Read the Docs config for the dependency-group move
mdickinson Aug 6, 2026
4420744
Move ets-from-source off EDM to uv
mdickinson Aug 6, 2026
95f9309
Give each toolkit its own uv cache key
mdickinson Aug 6, 2026
b58766e
Cut the comments in ets-from-source down to what the YAML can't say
mdickinson Aug 6, 2026
4483e81
Cut the same comments in the EDM and PyPI test workflows
mdickinson Aug 6, 2026
7ccc402
Say why configobj is listed separately from apptools
mdickinson Aug 6, 2026
98a42c7
Use uv add for the ETS source installs
mdickinson Aug 6, 2026
ce49cf2
Name the branch explicitly, and drop the pip freeze step
mdickinson Aug 6, 2026
74956da
Drop the comment on the uv add step
mdickinson Aug 6, 2026
f5d3887
Drop QT_MAC_WANTS_LAYER
mdickinson Aug 6, 2026
6e2e15b
Update EDM from 4.1.3 to 4.1.5
mdickinson Aug 6, 2026
903e646
Back out the EDM 4.1.5 bump
mdickinson Aug 6, 2026
f13faae
Use a fixed EDM environment name
mdickinson Aug 6, 2026
aa62a3c
Drop macOS from the EDM matrix, and use EDM 4.1.5
mdickinson Aug 6, 2026
8eecc73
Run the PyPI tests on macOS and Windows too
mdickinson Aug 6, 2026
ecc45f4
Restore fail-fast now the expanded matrix is green
mdickinson Aug 6, 2026
d690cbc
Trim the Running Tests section of AGENTS.md
mdickinson Aug 6, 2026
7d6b7e1
Thin the changelog down to the developer-facing changes
mdickinson Aug 6, 2026
a4a670c
Give style-requirements.txt its full path in the changelog
mdickinson Aug 6, 2026
97c79ff
Publish with the pypa action again, to keep attestations
mdickinson Aug 6, 2026
e2b23dc
Reduce the comment on the publish step
mdickinson Aug 6, 2026
b49dd98
Drop the last fail-fast override
mdickinson Aug 6, 2026
13ab8b3
Add a toolkit-free smoke test
mdickinson Aug 6, 2026
df44fcc
Give pyside6 its own gui group
mdickinson Aug 6, 2026
981d943
Describe the dependency groups as they now are
mdickinson Aug 6, 2026
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
21 changes: 0 additions & 21 deletions .coveragerc

This file was deleted.

6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ updates:
interval: "weekly"
cooldown:
default-days: 7
- package-ecosystem: "uv"
directory: "/"
schedule:
interval: "weekly"
cooldown:
default-days: 7
1 change: 0 additions & 1 deletion .github/workflows/bootstrap-requirements.txt

This file was deleted.

11 changes: 6 additions & 5 deletions .github/workflows/check-style-strict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ jobs:

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: '.github/workflows/style-requirements.txt'
- run: python -m pip install -r .github/workflows/style-requirements.txt
enable-cache: true
cache-suffix: style
- name: Report on out-of-date copyright end years
run: python -m flake8 --select H102 --copyright-end-year current .
run: |
uv run --locked --only-group style -m flake8 --select H102 --copyright-end-year current .
14 changes: 7 additions & 7 deletions .github/workflows/check-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: '.github/workflows/style-requirements.txt'
- run: python -m pip install -r .github/workflows/style-requirements.txt
enable-cache: true
cache-suffix: style
- run: |
python -m black --check --diff .
python -m isort --check --diff .
python -m flake8 .
uv run --locked --only-group style -m black --check --diff .
uv run --locked --only-group style -m isort --check --diff .
uv run --locked --only-group style -m flake8 .
42 changes: 16 additions & 26 deletions .github/workflows/ets-from-source.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,44 @@
name: Test with ETS packages from source

on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
schedule:
# Every Friday at 00:00 UTC
- cron: '0 0 * * 5'

env:
INSTALL_EDM_VERSION: 4.1.3
QT_MAC_WANTS_LAYER: 1
PYTHONUNBUFFERED: 1

jobs:

# Test against EDM packages
test-with-edm:
ets-from-source:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
runtime: ['3.11']
toolkit: ['null', 'pyside6']

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

steps:
- name: Clone the Envisage source
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Install packages for Qt support
uses: ./.github/actions/install-qt-support
- name: Cache EDM packages
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ~/.cache
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
- name: Set up EDM
uses: enthought/setup-edm-action@e68a4e0282298d695020fb21b4d3e93c3ac3c11f # v4.2
with:
edm-version: ${{ env.INSTALL_EDM_VERSION }}
- name: Set up bootstrap Python
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: '.github/workflows/bootstrap-requirements.txt'
- name: Install click to the bootstrap environment
run: python -m pip install -r .github/workflows/bootstrap-requirements.txt
- name: Install test environment
run: python etstool.py install --runtime=${{ matrix.runtime }} --toolkit=${{ matrix.toolkit }} --source
enable-cache: true
cache-suffix: ets-from-source
- name: Point the ETS dependencies at their main branches
run: >
uv add --branch main
"traits @ git+https://github.com/enthought/traits.git"
"pyface @ git+https://github.com/enthought/pyface.git"
"traitsui @ git+https://github.com/enthought/traitsui.git"
"apptools[preferences] @ git+https://github.com/enthought/apptools.git"
- name: Run tests (Ubuntu)
if: matrix.os == 'ubuntu-latest'
run: xvfb-run -a python etstool.py test --runtime=${{ matrix.runtime }} --toolkit=${{ matrix.toolkit }}
run: xvfb-run -a uv run -m pytest
- name: Run tests (not Ubuntu)
if: matrix.os != 'ubuntu-latest'
run: python etstool.py test --runtime=${{ matrix.runtime }} --toolkit=${{ matrix.toolkit }}
run: uv run -m pytest
16 changes: 6 additions & 10 deletions .github/workflows/publish-on-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,14 @@ jobs:
steps:
- name: Check out the release commit
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Set up Python
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: '3.14'
- name: Install Python packages needed for build and upload
run: |
python -m pip install build twine
enable-cache: true
cache-suffix: publish
- name: Build sdist and wheel
run: |
python -m build
- name: Check the distribution
run: |
python -m twine check --strict dist/*
run: uv build
Comment thread
mdickinson marked this conversation as resolved.
Resolved
# Not uv publish: it doesn't generate PEP 740 attestations.
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@ba38be9e461d3875417946c167d0b5f3d385a247 # v1.14.1
4 changes: 0 additions & 4 deletions .github/workflows/style-requirements.txt

This file was deleted.

12 changes: 5 additions & 7 deletions .github/workflows/test-doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@ jobs:

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'docs/requirements.txt'
enable-cache: true
cache-suffix: docs
- run: |
python -m pip install -r docs/requirements.txt
python -m pip install .
- run: |
python -m sphinx -b html -d docs/build/doctrees docs/source docs/build/html
uv run --locked --no-default-groups --group docs -m sphinx -b html -d docs/build/doctrees docs/source docs/build/html
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: documentation
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/test-with-edm.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
# This workflow targets stable released dependencies from EDM.
# Note that some packages may not actually be installed from EDM but from
# PyPI, see etstool.py implementations.

name: Test with EDM

on: [pull_request, workflow_dispatch]

env:
INSTALL_EDM_VERSION: 4.1.3
QT_MAC_WANTS_LAYER: 1
INSTALL_EDM_VERSION: 4.1.5
PYTHONUNBUFFERED: 1
# EDM's installer doesn't support extras, hence the explicit configobj.
EDM_PACKAGES: apptools configobj pyface pytest traits traitsui

jobs:

# Test against EDM packages
test-with-edm:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
os: ['ubuntu-latest', 'windows-latest']
runtime: ['3.11']
toolkit: ['null', 'pyside6']

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

steps:
- name: Clone the Envisage source
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand All @@ -30,24 +28,26 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ~/.cache
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('.github/workflows/test-with-edm.yml') }}
- name: Set up EDM
uses: enthought/setup-edm-action@e68a4e0282298d695020fb21b4d3e93c3ac3c11f # v4.2
with:
edm-version: ${{ env.INSTALL_EDM_VERSION }}
- name: Set up bootstrap Python
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
with:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: '.github/workflows/bootstrap-requirements.txt'
- name: Install click to the bootstrap environment
run: python -m pip install -r .github/workflows/bootstrap-requirements.txt
- name: Install test environment
run: python etstool.py install --runtime=${{ matrix.runtime }} --toolkit=${{ matrix.toolkit }}
- name: Create the EDM environment
run: edm environments create envisage --force --version=${{ matrix.runtime }}
- name: Install dependencies
run: edm --config edm.yaml install -y -e envisage ${{ env.EDM_PACKAGES }}
- name: Install the GUI toolkit
if: matrix.toolkit != 'null'
run: edm --config edm.yaml install -y -e envisage ${{ matrix.toolkit }}
- name: Install the package under test
run: edm run -e envisage -- python -m pip install . --no-dependencies
# Run from outside the source tree, to exercise the installed package.
- name: Run tests (Ubuntu)
if: matrix.os == 'ubuntu-latest'
run: xvfb-run -a python etstool.py test --runtime=${{ matrix.runtime }} --toolkit=${{ matrix.toolkit }}
working-directory: ${{ runner.temp }}
run: xvfb-run -a edm run -e envisage -- python -m pytest -c ${{ github.workspace }}/pyproject.toml --pyargs envisage
- name: Run tests (not Ubuntu)
if: matrix.os != 'ubuntu-latest'
run: python etstool.py test --runtime=${{ matrix.runtime }} --toolkit=${{ matrix.toolkit }}
working-directory: ${{ runner.temp }}
run: edm run -e envisage -- python -m pytest -c ${{ github.workspace }}/pyproject.toml --pyargs envisage
45 changes: 28 additions & 17 deletions .github/workflows/test-with-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,48 @@ env:

jobs:

# Test against PyPI packages, using pytest
test-with-pypi:
strategy:
matrix:
os: ['ubuntu-latest']
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.15']

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

steps:
- name: Clone the Envisage source
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Install packages for Qt support
uses: ./.github/actions/install-qt-support
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true
- name: Install packages needed for testing
run: python -m pip install pytest
- name: Install toolkit
# PySide6 caps Requires-Python below the newest version in the
# matrix, but its abi3 wheels work there regardless.
run: python -m pip install --ignore-requires-python pyside6
- name: Install package under test
run: python -m pip install .
- name: List installed packages
run: python -m pip list
enable-cache: true
cache-suffix: test
- name: Show the dependency tree
run: uv tree --locked
- name: Run tests (Ubuntu)
if: matrix.os == 'ubuntu-latest'
run: xvfb-run -a python -m pytest
run: xvfb-run -a uv run --locked -m pytest
- name: Run tests (not Ubuntu)
if: matrix.os != 'ubuntu-latest'
run: python -m pytest
run: uv run --locked -m pytest
Comment thread
mdickinson marked this conversation as resolved.
Resolved

# A smoke test that Envisage doesn't depend on a GUI toolkit being
# installed, and that the tests needing one skip rather than fail. No
# toolkit, so no Qt support packages and no xvfb-run either.
test-without-toolkit:
runs-on: 'ubuntu-latest'

steps:
- name: Clone the Envisage source
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: '3.14'
enable-cache: true
cache-suffix: test-without-toolkit
- name: Run tests, reporting what was skipped
run: uv run --locked --no-default-groups --group test -m pytest -rs
14 changes: 6 additions & 8 deletions .github/workflows/update-gh-pages-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@ jobs:

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'docs/requirements.txt'
enable-cache: true
cache-suffix: docs
- run: |
python -m pip install -r docs/requirements.txt
python -m pip install .
- run: |
python -m sphinx -b html -d docs/build/doctrees docs/source docs/build/html
uv run --locked --no-default-groups --group docs -m sphinx -b html -d docs/build/doctrees docs/source docs/build/html
- name: Check out gh-pages branch
run: |
git fetch --depth=1 origin gh-pages
git worktree add ../docs gh-pages
- name: Update the docs on the gh-pages branch
run: |
python docs/update_gh_pages.py docs/build/html ../docs --tag ${{ github.ref_name }}
uv run --locked --no-default-groups --group docs docs/update_gh_pages.py docs/build/html ../docs --tag ${{ github.ref_name }}
Comment thread
mdickinson marked this conversation as resolved.
Resolved
- name: Configure Git
run: |
git config user.name "Documentation Bot"
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/update-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@ jobs:

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'docs/requirements.txt'
enable-cache: true
cache-suffix: docs
- run: |
python -m pip install -r docs/requirements.txt
python -m pip install .
- run: |
python -m sphinx -b html -d docs/build/doctrees docs/source docs/build/html
uv run --locked --no-default-groups --group docs -m sphinx -b html -d docs/build/doctrees docs/source docs/build/html
- name: Check out gh-pages branch
run: |
git fetch --depth=1 origin gh-pages
git worktree add ../docs gh-pages
- name: Update the docs on the gh-pages branch
run: |
python docs/update_gh_pages.py docs/build/html ../docs
uv run --locked --no-default-groups --group docs docs/update_gh_pages.py docs/build/html ../docs
Comment thread
mdickinson marked this conversation as resolved.
Resolved
- name: Configure Git
run: |
git config user.name "Documentation Bot"
Expand Down
Loading