Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
echo "PKG_CONFIG_PATH=C:/mingw64/lib/pkgconfig" >> $GITHUB_ENV

- name: Build wheels
uses: pypa/cibuildwheel@v3.4.1
uses: pypa/cibuildwheel@v4.3.1
env:
# All cibuildwheel options are here (nothing "hidden" in pyproject.toml)
CIBW_SKIP: "*-win32 *i686 cp3??t-*"
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
resolution: ["lowest-direct", "highest"]
exclude:
- python-version: "3.12"
resolution: "lowest-direct"
- python-version: "3.13"
resolution: "lowest-direct"
- python-version: "3.14"
resolution: "lowest-direct"
resolution: "lowest-direct"
- python-version: "3.15"
resolution: "lowest-direct"
steps:
- name: Checkout code
uses: actions/checkout@v5
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: 3.15",
"Topic :: Scientific/Engineering",
]

Expand All @@ -38,7 +39,7 @@ dev = [
"meson-python>=0.18.0",
"pytest>=8.4.1",
"pytest-cov>=6.2.1",
"scipy>=1.10,<1.17",
"scipy>=1.10,<1.19",
"build>=1.5.0",
]
docs = [
Expand Down
5 changes: 3 additions & 2 deletions tests/test_odr_fit.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

import numpy as np
import pytest
from scipy.odr import odr as odrscipy
from scipy.optimize import curve_fit

from odrpack import OdrStop, odr_fit
from odrpack.__odrpack import loc_rwork
Expand Down Expand Up @@ -677,6 +675,9 @@ def f(x: np.ndarray, beta: np.ndarray) -> np.ndarray:
@pytest.mark.xfail(reason="Fails in conda-forge::linux_aarch64")
def test_compare_scipy(case1, case2, case3):

odrscipy = pytest.importorskip("scipy.odr").odr
curve_fit = pytest.importorskip("scipy.optimize").curve_fit

# case1 // scipy.optimize.curve_fit
sol1 = odr_fit(**case1, task='OLS')
sol2 = curve_fit(lambda x, *b: case1['f'](x, np.array(b)),
Expand Down
Loading