Repository navigation
Modernize the build: remove etstool.py, uv-driven CI, uv_build, uv.lock #628
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
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 3961668
Use uv natively: dependency groups instead of uv pip
mdickinson 3871cd7
Set the uv Python version via setup-uv rather than UV_PYTHON
mdickinson e93c5cb
Add a dev dependency group composing style and test
mdickinson ec7d660
Merge remote-tracking branch 'origin/main' into remove-etstool
mdickinson 93bce6f
Fix ets-from-source on Windows, and use uv run -m
mdickinson 1e10cdb
Run everything through uv run in AGENTS.md
mdickinson 0e2f182
Give each uv cache its own key via cache-suffix
mdickinson 47c43df
Ask each job for the dependency groups it actually needs
mdickinson 513ff89
Name the uv tree step for what it does
mdickinson 9791a6b
Don't ignore .venv explicitly
mdickinson fa4df17
Drop the comment on the dev group
mdickinson 1e2b5b0
Fold the test group into dev
mdickinson 122e98e
Merge remote-tracking branch 'origin/main' into remove-etstool
mdickinson 0279196
Re-file the #628 changelog entries under 8.1.0
mdickinson 89d4672
Add a Released placeholder to the 8.1.0 section
mdickinson eb54afd
Remove .coveragerc
mdickinson 696ec50
Build with uv_build instead of setuptools
mdickinson c00e975
Trim the two long pyproject.toml comments to one line each
mdickinson 930fb2e
Track uv.lock, and install from it in CI
mdickinson 8d5668f
Have dependabot keep uv.lock up to date
mdickinson 290e4b7
Drop test-with-latest in favour of dependabot
mdickinson 54fe619
Keep the two tool.uv tables together
mdickinson 542d1a7
Stop shipping CHANGES.rst in the source distribution
mdickinson ede6252
Fix the Read the Docs config for the dependency-group move
mdickinson 4420744
Move ets-from-source off EDM to uv
mdickinson 95f9309
Give each toolkit its own uv cache key
mdickinson b58766e
Cut the comments in ets-from-source down to what the YAML can't say
mdickinson 4483e81
Cut the same comments in the EDM and PyPI test workflows
mdickinson 7ccc402
Say why configobj is listed separately from apptools
mdickinson 98a42c7
Use uv add for the ETS source installs
mdickinson ce49cf2
Name the branch explicitly, and drop the pip freeze step
mdickinson 74956da
Drop the comment on the uv add step
mdickinson f5d3887
Drop QT_MAC_WANTS_LAYER
mdickinson 6e2e15b
Update EDM from 4.1.3 to 4.1.5
mdickinson 903e646
Back out the EDM 4.1.5 bump
mdickinson f13faae
Use a fixed EDM environment name
mdickinson aa62a3c
Drop macOS from the EDM matrix, and use EDM 4.1.5
mdickinson 8eecc73
Run the PyPI tests on macOS and Windows too
mdickinson ecc45f4
Restore fail-fast now the expanded matrix is green
mdickinson d690cbc
Trim the Running Tests section of AGENTS.md
mdickinson 7d6b7e1
Thin the changelog down to the developer-facing changes
mdickinson a4a670c
Give style-requirements.txt its full path in the changelog
mdickinson 97c79ff
Publish with the pypa action again, to keep attestations
mdickinson e2b23dc
Reduce the comment on the publish step
mdickinson b49dd98
Drop the last fail-fast override
mdickinson 13ab8b3
Add a toolkit-free smoke test
mdickinson df44fcc
Give pyside6 its own gui group
mdickinson 981d943
Describe the dependency groups as they now are
mdickinson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.