Skip to content

Commit

Permalink
maint: bump min gvar to 12.0 for custom formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Gattocrucco committed Dec 22, 2023
1 parent 8270d55 commit 15f2ff0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
1 change: 0 additions & 1 deletion .github/workflows/tests-requirements-old-nopep517.txt

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/tests-requirements-old.txt

This file was deleted.

5 changes: 1 addition & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,7 @@ jobs:
if: matrix.python-version == '3.8'
run: |
python -m pip install --upgrade pip
python -m pip install -r .github/workflows/tests-requirements-old.txt
python -m pip install setuptools wheel # required by --no-use-pep517
python -m pip install --no-use-pep517 -r .github/workflows/tests-requirements-old-nopep517.txt
python -m pip install .
python -m pip install '.[tests-old]'
- name: Run unit tests
run: make COVERAGE_SUFFIX=-${{ matrix.os }}-py${{ matrix.python-version }} tests
- name: Save coverage information
Expand Down
22 changes: 17 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ dependencies = [
'scipy>=1.5', # oldest supported by jax 0.4.6
'jax>=0.4.6', # first with optimized jnp.vectorize (for BART)
'jaxlib>=0.4.6',
'gvar>=11.10.1,!=11.11.3',
# 11.10.1 first supporting gvar.gvar(x, cov) with readonly cov
# 11.11.3 gives problems to lsqfit
'gvar>=12.0', # 12.0 first with custom formatting
]
dynamic = ["version"]

Expand Down Expand Up @@ -87,7 +85,7 @@ dev = [ # to work locally on lsqfitgp
tests = [ # to run the unit tests on CI
"numpy",
"scipy",
"gvar!=11.11.3",
"gvar",
"jax",
"jaxlib",
"pytest",
Expand All @@ -97,11 +95,25 @@ tests = [ # to run the unit tests on CI
"polars[pyarrow]",
]

tests-old = [ # to run the unit tests on CI, with minimum supported dependencies
"numpy==1.20",
"scipy==1.5",
"gvar==12.0",
"jax==0.4.6",
"jaxlib==0.4.6",
"pytest",
"coverage[toml]",
"mpmath",
"pandas<1.5",
"polars==0.15.16",
"pyarrow==10.0.1",
]

docs = [ # to run examples, documentation code, and build documentation on CI
"numpy",
"scipy",
"matplotlib",
"gvar!=11.11.3",
"gvar",
"lsqfit",
"jax",
"jaxlib",
Expand Down
3 changes: 2 additions & 1 deletion src/lsqfitgp/_gvarext/_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ def gvar_format(spec=None, *, lsqfitgp_format=True):
Parameters
----------
spec : str, optional
The format specification.
The format specification. If not specified and `lsqfitgp_format` is
``True``, use ``'1.5p'``.
lsqfitgp_format : bool, default True
Whether to use a modified version of the `gvar` formatting
specification, provided by `lsqfitgp`.
Expand Down

0 comments on commit 15f2ff0

Please sign in to comment.