Skip to content

Commit a122b50

Browse files
committed
pixi update
1 parent bc445c9 commit a122b50

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

.github/workflows/asv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Run benchmarks
4040
shell: bash
4141
run: |
42-
MACHINE=${{ matrix.os }} pixi run asv-build
42+
pixi run asv-build ${{ matrix.os }}
4343
4444
- name: Upload benchmark results
4545
uses: actions/upload-artifact@v4

.github/workflows/emscripten.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v5
1111
- name: Build WASM wheel
12-
uses: pypa/cibuildwheel@v3.1.4
12+
uses: pypa/cibuildwheel@v3.2.0
1313
env:
1414
CIBW_PLATFORM: pyodide
1515
- name: Upload package

.github/workflows/test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,17 @@ jobs:
3232
run: |
3333
pixi run -e dev test
3434
- name: Test with doctest
35-
shell: bash
35+
if: matrix.os == 'ubuntu-latest'
3636
run: |
3737
pixi run -e dev doc
38-
CMD=doctest pixi run -e dev doc
38+
pixi run -e dev doc sphinx-build doctest
3939
- name: Test nogil
4040
run: |
4141
pixi run -e nogil nogil-eta
4242
- name: Test coverage
4343
if: matrix.os == 'ubuntu-latest'
44-
shell: bash
4544
run: |
46-
FMT=xml pixi run -e dev test-coverage
45+
pixi run -e dev test-coverage xml
4746
- name: Upload coverage reports to Codecov
4847
if: matrix.os == 'ubuntu-latest'
4948
uses: codecov/codecov-action@v5

.github/workflows/wheel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@v5
3535
- name: Build wheels
36-
uses: pypa/cibuildwheel@v3.1.4
36+
uses: pypa/cibuildwheel@v3.2.0
3737
env:
3838
CIBW_SKIP: "*_i686 *_ppc64le *_s390x *_universal2 *-musllinux_* cp314t*"
3939
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.10"

.readthedocs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ conda:
1414
environment: rtd-environment.yml
1515

1616
sphinx:
17-
configuration: doc/conf.py
17+
configuration: doc/conf.py
18+
fail_on_warning: true

pixi.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,18 @@ compilers = "*"
120120
[tool.pixi.tasks]
121121
time-h = "python -m timeit -n 5 -s 'import numpy as np; from fastcan import FastCan; X = np.random.rand(3000, 100); y = np.random.rand(3000, 20)' 's = FastCan(100, verbose=0).fit(X, y)'"
122122
time-eta = "python -m timeit -n 5 -s 'import numpy as np; from fastcan import FastCan; X = np.random.rand(3000, 100); y = np.random.rand(3000, 20)' 's = FastCan(100, eta=True, verbose=0).fit(X, y)'"
123-
profile-minibatch = { cmd = '''python -c "import cProfile; import numpy as np; from fastcan import minibatch; X = np.random.rand(100, 3000); y = np.random.rand(100, 20); cProfile.run('minibatch(X, y, 1000, 10, verbose=0)', sort='$SORT')"''', env = { SORT = "cumtime" } }
123+
profile-minibatch = { cmd = '''python -c "import cProfile; import numpy as np; from fastcan import minibatch; X = np.random.rand(100, 3000); y = np.random.rand(100, 20); cProfile.run('minibatch(X, y, 1000, 10, verbose=0)', sort='{{ SORT }}')"''', args = [{ arg = "SORT", default = "cumtime" }] }
124124
time-narx = '''python -m timeit -n 1 -s "import numpy as np; from fastcan.narx import make_narx; rng = np.random.default_rng(5); X = rng.random((1000, 10)); y = rng.random((1000, 2)); m = make_narx(X, y, 10, max_delay=2, poly_degree=2, verbose=0)" "m.fit(X, y, coef_init='one_step_ahead', verbose=1)"'''
125-
profile-narx = { cmd = '''python -c "import cProfile; import numpy as np; from fastcan.narx import make_narx; rng = np.random.default_rng(8); X = rng.random((3000, 3)); y = rng.random((3000, 3)); m = make_narx(X, y, 10, max_delay=10, poly_degree=2, verbose=0); cProfile.run('m.fit(X, y, coef_init=[0]*33)', sort='$SORT')"''', env = { SORT = "tottime" } }
125+
profile-narx = { cmd = '''python -c "import cProfile; import numpy as np; from fastcan.narx import make_narx; rng = np.random.default_rng(8); X = rng.random((3000, 3)); y = rng.random((3000, 3)); m = make_narx(X, y, 10, max_delay=10, poly_degree=2, verbose=0); cProfile.run('m.fit(X, y, coef_init=[0]*33)', sort='{{ SORT }}')"''', args = [{ arg = "SORT", default = "tottime" }] }
126126

127127
[tool.pixi.feature.asv.tasks]
128-
asv-build = { cmd = "python -m asv machine --machine $MACHINE --yes && python -m asv run --show-stderr -v --machine $MACHINE $EXTRA_ARGS", cwd = "asv_benchmarks", env = { MACHINE = "MacOS-M1", EXTRA_ARGS = "" } }
128+
asv-build = { cmd = "python -m asv machine --machine {{ MACHINE }} --yes && python -m asv run --show-stderr -v --machine {{ MACHINE }} {{ EXTRA_ARGS }}", cwd = "asv_benchmarks", args = [{ arg = "MACHINE", default = "MacOS-M1" }, { arg = "EXTRA_ARGS", default = "" }] }
129129
asv-publish = { cmd = "python -m asv publish", cwd = "asv_benchmarks" }
130130
asv-preview = { cmd = "python -m asv preview", cwd = "asv_benchmarks", depends-on = ["asv-publish"] }
131131

132132
[tool.pixi.feature.test.tasks]
133133
test = { cmd = "pytest", cwd = "." }
134-
test-coverage = { cmd = "rm -rf .coverage && pytest --cov-report $FMT --cov=$PACKAGE .", env = { PACKAGE = "fastcan", FMT = "html" } }
134+
test-coverage = { cmd = "rm -rf .coverage && pytest --cov-report {{ FMT }} --cov={{ PACKAGE }} .", args = [{ arg = "PACKAGE", default = "fastcan" }, { arg = "FMT", default = "html" }] }
135135

136136
[tool.pixi.feature.build.tasks]
137137
build-wheel = "rm -rf dist && python -m build -wnx -Cinstall-args=--tags=runtime,python-runtime,devel"
@@ -146,8 +146,8 @@ type = { cmd = "mypy . --ignore-missing-imports", cwd = "fastcan" }
146146
spell = "codespell"
147147

148148
[tool.pixi.feature.docs.tasks]
149-
doc = { cmd = "$SPHINXBUILD -M $CMD $SOURCEDIR $BUILDDIR $SPHINXOPTS", cwd = "doc", env = { SPHINXBUILD = "sphinx-build", CMD = "html", SOURCEDIR = ".", BUILDDIR = "_build", SPHINXOPTS = "" } }
150-
doc-clean = { cmd = "rm -rf $BUILDDIR generated auto_examples jupyterlite_contents", cwd = "doc", env = { BUILDDIR = "_build" } }
149+
doc = { cmd = "{{ SPHINXBUILD }} -M {{ CMD }} {{ SOURCEDIR }} {{ BUILDDIR }} {{ SPHINXOPTS }} --fail-on-warning", cwd = "doc", args = [{ arg = "SPHINXBUILD", default = "sphinx-build" }, { arg = "CMD", default = "html" }, { arg = "SOURCEDIR", default = "." }, { arg = "BUILDDIR", default = "_build" }, { arg = "SPHINXOPTS", default = "" }] }
150+
doc-clean = { cmd = "rm -rf {{ BUILDDIR }} generated auto_examples jupyterlite_contents", cwd = "doc", args = [{ arg = "BUILDDIR", default = "_build" }] }
151151
doc-deploy = { cmd = "python -m http.server" , cwd = "doc/_build/html" }
152152

153153
[tool.pixi.feature.nogil.tasks]

rtd-environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies:
1111
- sphinx-design
1212
- sphinxcontrib-plantuml
1313
- jupyterlite-sphinx
14+
- plantuml
1415
- pip:
1516
- .
1617
- jupyterlite-xeus >=2.1.2

0 commit comments

Comments
 (0)