Skip to content

Commit f2d3296

Browse files
chore: update Pixi in CI (#25)
* chore: update Pixi in CI * Remove coverage and update lock files * remove --cov argument * fix unit test invocation * remove old Pixi from CI
1 parent c4ff6c5 commit f2d3296

File tree

11 files changed

+14576
-13330
lines changed

11 files changed

+14576
-13330
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- main
88

99
env:
10-
pixi-version: "0.26.1"
10+
pixi-version: "0.30.0"
1111

1212
jobs:
1313
test:
@@ -17,7 +17,7 @@ jobs:
1717
# https://github.com/ipython/ipykernel/issues/713
1818
# https://stackoverflow.com/questions/70841648/jupyter-reverts-signal-handler-to-default-when-running-next-cell
1919
os: [ubuntu-latest, macos-latest]
20-
pixi-version: ["0.21.0", "0.26.1"]
20+
pixi-version: ["0.30.0"]
2121
python-version: ["38", "39", "310", "311", "312"]
2222
runs-on: ${{ matrix.os }}
2323
steps:
@@ -30,34 +30,7 @@ jobs:
3030
run-install: false
3131
- name: Test with pixi
3232
run: pixi run --locked --environment py${{ matrix.python-version }} test-py${{ matrix.python-version }}
33-
- name: Store coverage
34-
uses: actions/upload-artifact@v4
35-
with:
36-
name: coverage-${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.pixi-version }}
37-
path: .coverage.Linux*
38-
coverage:
39-
needs: test
40-
runs-on: ubuntu-22.04
41-
steps:
42-
- name: Checkout repo
43-
uses: actions/checkout@v4
44-
- name: Install Pixi ${{ env.pixi-version }}
45-
uses: prefix-dev/setup-pixi@v0.8.0
46-
with:
47-
pixi-version: v${{ env.pixi-version }}
48-
run-install: false
49-
- name: Fetch coverage
50-
uses: actions/download-artifact@v4
51-
with:
52-
pattern: coverage-*
53-
merge-multiple: true
54-
- name: Combine coverage and generate report
55-
run: pixi run --locked --environment test coverage
56-
- name: Upload coverage to Codecov
57-
uses: codecov/codecov-action@v4
58-
with:
59-
fail_ci_if_error: true
60-
token: ${{ secrets.CODECOV_TOKEN }}
33+
6134
lint:
6235
runs-on: ubuntu-22.04
6336
steps:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "v*"
77

88
env:
9-
pixi-version: "0.26.1"
9+
pixi-version: "0.30.0"
1010

1111
jobs:
1212
pypi-publish:

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,5 @@ dist
1818
# IDEs
1919
/.vscode
2020

21-
# coverage
22-
/.coverage*
23-
/htmlcov
24-
/coverage.xml
25-
2621
# System
2722
.DS_Store

codecov.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

pixi.lock

Lines changed: 5375 additions & 5300 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ update-lock = "scripts/update-lock.sh"
2626
# Testing
2727
[feature.test.dependencies]
2828
pytest = ">=8.1,<9"
29-
pytest-cov = "*"
3029

3130
[feature.test.tasks]
3231
# Unit tests
33-
unit = "COVERAGE_FILE=.coverage.$(python -c 'import platform; print(platform.system())').$PIXI_ENVIRONMENT_NAME python -m pytest --cov pixi_kernel"
32+
unit = "python -m pytest tests/unit"
3433

3534
# Integration tests
3635
bash-kernel = { cwd = "tests/integration/bash_kernel", cmd = "PYDEVD_DISABLE_FILE_VALIDATION=1 pixi run --locked --manifest-path=pixi.toml python kernel.py" }
@@ -40,7 +39,6 @@ xeus-cling = { cwd = "tests/integration/xeus-cling", cmd = "pixi run --locked --
4039

4140
# Combined
4241
test = { depends_on = ["unit", "ipykernel", "r-irkernel"] }
43-
coverage = "coverage combine && coverage html && coverage xml"
4442

4543
# Integration tests for platform-specific kernels
4644
[feature.test.target.linux-64.tasks]

pyproject.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ filterwarnings = [
6969
"ignore:Jupyter is migrating its paths to use standard platformdirs",
7070
]
7171

72-
[tool.coverage.run]
73-
branch = true
74-
75-
[tool.coverage.paths]
76-
source = ["src/", ".pixi/envs/**/lib/python*/site-packages/"]
77-
7872
[tool.hatch.build.targets.wheel.shared-data]
7973
"kernels" = "share/jupyter/kernels"
8074

tests/integration/bash_kernel/pixi.lock

Lines changed: 2113 additions & 1730 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/integration/ipykernel/pixi.lock

Lines changed: 2111 additions & 1728 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/integration/r-irkernel/pixi.lock

Lines changed: 4378 additions & 4048 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)