Skip to content

Commit

Permalink
Merge branch 'nanograv:master' into fixdocstrings
Browse files Browse the repository at this point in the history
  • Loading branch information
dlakaplan authored Dec 10, 2024
2 parents 4a67d29 + 19abb24 commit 9c191d3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,5 @@ jobs:
python -m pip install --force-reinstall --no-deps .
- name: Run tests
shell: bash -el {0}
run: pytest -v --pyargs tests
run: pytest -v --pyargs tests --reruns 5

1 change: 1 addition & 0 deletions CHANGELOG-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ the released changes.
- When TCB->TDB conversion info is missing, will print parameter name
- Piecewise-constant model for chromatic variations (CMX)
- `add_param` returns the name of the parameter (useful for numbered parameters)
- Rerun intermittent failures in CI
- micromamba CI environment for testing macOS-latest, without tox
### Fixed
- Changed WAVE_OM units from 1/d to rad/d.
Expand Down
3 changes: 2 additions & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ wheel>=0.29.0
pytest>=4.3
pytest-cov>=2.7.1
pytest-runner>=5.1
pytest-xdist
pytest-rerunfailures
flake8>=3.7
pep8-naming>=0.8.2
flake8-docstrings>=1.4
Expand All @@ -37,4 +39,3 @@ loguru
# click<=8.0.4
gprof2dot
py-cpuinfo
pytest-xdist
9 changes: 6 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,15 @@ deps =
cov: coverage
cov: pytest-cov
cov: pytest-remotedata
pytest-rerunfailures
hypothesis
numdifftools
pathos
setuptools
commands =
pip freeze
!cov: pytest
cov: pytest -v --pyargs tests --cov=pint --cov-config={toxinidir}/.coveragerc {posargs}
!cov: pytest --reruns 5
cov: pytest -v --pyargs tests --cov=pint --cov-config={toxinidir}/.coveragerc {posargs} --reruns 5
cov: coverage xml -o {toxinidir}/coverage.xml

depends =
Expand Down Expand Up @@ -88,9 +89,11 @@ deps =
matplotlib==3.4.3
scipy==1.9.0
pytest
pytest-rerunfailures
coverage
hypothesis<=6.72.0
commands = {posargs:pytest}
commands =
pytest --reruns 5

[testenv:report]
skip_install = true
Expand Down

0 comments on commit 9c191d3

Please sign in to comment.