Skip to content

Commit 55b6df2

Browse files
authored
Merge pull request #459 from light-curve/cesium
Replace feets with cesium for tests
2 parents 3820cd9 + 413bb36 commit 55b6df2

File tree

4 files changed

+81
-90
lines changed

4 files changed

+81
-90
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ jobs:
6363

6464
steps:
6565
- uses: actions/checkout@v4
66+
with:
67+
submodules: true
6668

6769
- name: Set up QEMU on Linux
6870
if: ${{ runner.os == 'Linux' }}

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
source <(cargo llvm-cov show-env --export-prefix)
120120
python -m venv venv
121121
source venv/bin/activate
122-
maturin develop --extras=test-no-bench,test
122+
maturin develop --extras=test
123123
python -m pytest
124124
cargo llvm-cov report --lcov --output-path lcov.info
125125
- name: Upload coverage to Codecov
@@ -158,7 +158,7 @@ jobs:
158158
python3 -m venv venv
159159
. venv/bin/activate
160160
pip install "${{ needs.py_build_deps.outputs.output }}" pytest-codspeed
161-
maturin develop --extras=test-no-bench,test --release
161+
maturin develop --extras=test --release
162162
python3 -mpytest -m "not (nobs or multi)" --codspeed tests/test_w_bench.py
163163
164164
msrv-build:

light-curve/pyproject.toml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,15 @@ full = [
2828
]
2929

3030
# Testing environment
31-
test-no-bench = [
32-
"pytest",
33-
"markdown-pytest",
34-
"pytest-benchmark", # We need it here because we use benchmark-specific command line options
35-
"pytest-subtests>=0.10",
36-
"iminuit>=2.21,<3",
37-
"numpy<2",
38-
"scipy",
39-
]
4031
test = [
4132
"pytest",
4233
"markdown-pytest",
4334
"pytest-benchmark",
4435
"pytest-subtests>=0.10",
4536
"iminuit>=2.21,<3",
46-
"numpy<2",
37+
"numpy",
4738
"scipy",
48-
"feets",
39+
"cesium",
4940
"joblib",
5041
"pandas",
5142
]
@@ -55,9 +46,9 @@ dev = [
5546
"pytest-benchmark",
5647
"pytest-subtests>=0.10",
5748
"iminuit>=2.21,<3",
58-
"numpy<2",
49+
"numpy",
5950
"scipy",
60-
"feets",
51+
"cesium",
6152
"joblib",
6253
"pandas",
6354
"black",
@@ -239,10 +230,8 @@ select = "*linux_x86_64"
239230
environment = { "PATH" = "$PATH:$HOME/.cargo/bin", "MATURIN_PEP517_ARGS" = "--locked --no-default-features --features=abi3,ceres-system,fftw-mkl,gsl,mimalloc" }
240231

241232
# Test
242-
# We skip benchmark tests, because it requires feets and its transitive
243-
# dependencies, which are tricky and slow to compile on marginal platforms.
244-
# For testing we use only platforms for which scipy binary wheels are available
233+
# We use platforms natively available on GitHub Actions and skip Windows because it doesn't support all the features
245234
[[tool.cibuildwheel.overrides]]
246-
select = "cp*-manylinux_x86_64 cp*-manylinux_aarch64 cp*-macosx*"
247-
test-command = "pytest {package}/README.md {package}/light_curve/ {package}/tests/ --ignore {package}/tests/test_w_bench.py"
248-
test-extras = ["test-no-bench"]
235+
select = "cp*-manylinux_x86_64 cp*-macosx*"
236+
test-command = "pytest {package}/README.md {package}/light_curve/ {package}/tests/"
237+
test-extras = ["test"]

0 commit comments

Comments
 (0)