-
Notifications
You must be signed in to change notification settings - Fork 7
Correct the dev dependency table PEP 735 #126
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
36 commits
Select commit
Hold shift + click to select a range
713a067
Correct the dev dependency table PEP 735
joasode 0d69cf3
Update CI to use uv with dependency groups
joasode f902b4d
Attempt to build RTD
joasode 50d440b
pre-commit
joasode f375481
RTD dependency
joasode d1f9d72
Add another RTD dependency
joasode c28ab97
Add another RTD dependency
joasode 641c11f
Update RTD yaml
joasode 518ce50
Update readthedocs.yml
joasode 5fd9912
Include old sphinx-build arguments
joasode 28b924c
Attempt RTD fix
joasode e2e6ed4
Update .readthedocs.yml to uv sync
joasode 8a64172
Add cache usage when we have uv.lock
joasode e839894
One-line uv sync in CI_pull_request.yml
joasode 71627bb
Update .readthedocs.yml
joasode 2902d74
typo
joasode 0fc0188
Another typo
joasode c9c6a6f
Update lint with debug info
joasode b34dcef
Add lint push action with debug info
joasode 016e5d2
Add uv run command in CI_push
joasode ab33584
Experiment with pre-commit key in push action
joasode c6b917d
Remove debug info and invalid key
joasode 5882a28
Add back in the cache key...
joasode 9fc8ad0
Remove env.pythonLocation from lint cache key
joasode 19ecd6e
Add uv run to CI_pull_request linting
joasode c50d7bb
Debug managed-python
joasode c01bcdd
Debug managed-python in CI_push
joasode dd11cd1
unify sync command and specify lint python to avoid pre-release
joasode 25035ec
Enable cache when code is checked out (e.g. uv.lock is present)
joasode 40f4c7e
Add in names for GitHub action steps
joasode c179e44
Add review changes
joasode 347d66c
Experiment with readthedocs tools
joasode 278c2ac
Lets undo that
joasode cde4de3
Single line run: uv sync
joasode d6ddb1b
Merge branch 'main' into correct-dependency-table
joasode 4c8fed1
Update uv.lock
joasode 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 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 |
|---|---|---|
|
|
@@ -11,19 +11,33 @@ jobs: | |
| name: Lint and check formatting | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-python@v5 | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up uv | ||
| uses: astral-sh/setup-uv@v5 | ||
| - name: Verify the uv.lock is up-to-date | ||
| run: uv lock --check | ||
| - name: Install linting dependencies | ||
| run: uv sync --python 3.12 --managed-python --group=lint --frozen | ||
| - name: Restore pre-commit cache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| python-version: "3.x" | ||
| - uses: pre-commit/[email protected] | ||
| path: ~/.cache/pre-commit | ||
| key: pre-commit-3-${{ hashFiles('.pre-commit-config.yaml') }} | ||
| - name: Run pre-commit on all files | ||
| run: uv run pre-commit run --show-diff-on-failure --color=always --all-files | ||
| build: | ||
| name: Build package | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: astral-sh/setup-uv@v5 | ||
| - run: uv build . | ||
| - uses: actions/upload-artifact@v4 | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up uv | ||
| uses: astral-sh/setup-uv@v5 | ||
| - name: Build the Python Package | ||
| run: uv build | ||
| - name: Upload build artifacts for subsequent workflow steps | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: dist | ||
| path: dist | ||
|
|
@@ -65,17 +79,14 @@ jobs: | |
| run: | | ||
| sudo apt install ./singularity_installer.deb | ||
| singularity --version | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| cache: pip | ||
| - name: Set up uv | ||
| uses: astral-sh/setup-uv@v5 | ||
|
|
||
| - name: Install test dependencies | ||
| run: | | ||
| python3 -m pip install --upgrade pip | ||
| python3 -m pip install -e .[tests] | ||
| run: uv sync --python ${{ matrix.python-version }} --managed-python --group=tests --frozen | ||
|
|
||
| - name: Run test suite via pytest | ||
| run: pytest -vv --junitxml=pytest_junit_out.xml | ||
| run: uv run pytest -vv --junitxml=pytest_junit_out.xml | ||
| - name: Archive the test results and coverage | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
|
|
@@ -106,18 +117,13 @@ jobs: | |
| sudo apt update | ||
| sudo apt install -y apptainer | ||
| singularity --version | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| cache: pip | ||
| cache-dependency-path: "**/test-requirements.txt" | ||
| - name: Set up uv | ||
| uses: astral-sh/setup-uv@v5 | ||
|
|
||
| - name: Install test dependencies | ||
| run: | | ||
| python3 -m pip install --upgrade pip | ||
| python3 -m pip install -r test-requirements.txt | ||
| run: uv sync --python ${{ matrix.python-version }} --managed-python --group=tests --frozen | ||
| - name: Run test suite via pytest | ||
| run: pytest -vv --junitxml=pytest_junit_out.xml | ||
| run: uv run pytest -vv --junitxml=pytest_junit_out.xml | ||
| - name: Archive the test results and coverage | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -10,11 +10,21 @@ jobs: | |
| name: Lint and check formatting | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-python@v5 | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up uv | ||
| uses: astral-sh/setup-uv@v5 | ||
| - name: Verify the uv.lock is up-to-date | ||
| run: uv lock --check | ||
| - name: Install linting dependencies | ||
| run: uv sync --python 3.12 --managed-python --group=lint --frozen | ||
| - name: Restore pre-commit cache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| python-version: "3.x" | ||
| - uses: pre-commit/[email protected] | ||
| path: ~/.cache/pre-commit | ||
| key: pre-commit-3-${{ hashFiles('.pre-commit-config.yaml') }} | ||
| - name: Run pre-commit on all files | ||
| run: uv run pre-commit run --show-diff-on-failure --color=always --all-files | ||
| run-unittests: | ||
| name: Run unittests | ||
| runs-on: ubuntu-latest | ||
|
|
@@ -25,14 +35,10 @@ jobs: | |
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| cache: pip | ||
| - name: Set up uv | ||
| uses: astral-sh/setup-uv@v5 | ||
|
|
||
| - name: Install test dependencies | ||
| run: | | ||
| python3 -m pip install --upgrade pip | ||
| python3 -m pip install -e .[tests] | ||
| run: uv sync --python ${{ matrix.python-version }} --managed-python --group=tests --frozen | ||
| - name: Run unittests via pytest | ||
| run: pytest -vv -m "not endtoend and not singularity_integration and not conda_integration" | ||
| run: uv run pytest -vv -m "not endtoend and not singularity_integration and not conda_integration" | ||
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.