From 14c571846282cd6b3ba72428b5a479e42162ae67 Mon Sep 17 00:00:00 2001 From: Abhimanyu Susobhanan Date: Wed, 4 Dec 2024 09:39:23 +0100 Subject: [PATCH 1/6] reruns --- requirements_dev.txt | 3 ++- tox.ini | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index f5dfff94b..b3c22a6ac 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -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 @@ -38,4 +40,3 @@ loguru # click<=8.0.4 gprof2dot py-cpuinfo -pytest-xdist diff --git a/tox.ini b/tox.ini index efadd9b9c..58c0e0ebb 100644 --- a/tox.ini +++ b/tox.ini @@ -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 = @@ -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 From 443d4a6a89bc2712dad86b9ad45d89d61ada8699 Mon Sep 17 00:00:00 2001 From: Abhimanyu Susobhanan Date: Wed, 4 Dec 2024 09:40:10 +0100 Subject: [PATCH 2/6] changelog --- CHANGELOG-unreleased.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-unreleased.md b/CHANGELOG-unreleased.md index cd766f352..67577f84c 100644 --- a/CHANGELOG-unreleased.md +++ b/CHANGELOG-unreleased.md @@ -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 ### Fixed - Changed WAVE_OM units from 1/d to rad/d. - When EQUAD is created from TNEQ, has proper TCB->TDB conversion info From 66e736b2c7ea6e8b98b7b2835d5dc0be3fcded00 Mon Sep 17 00:00:00 2001 From: Abhimanyu Susobhanan Date: Wed, 4 Dec 2024 09:41:49 +0100 Subject: [PATCH 3/6] typo --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 58c0e0ebb..e54f6071f 100644 --- a/tox.ini +++ b/tox.ini @@ -92,7 +92,7 @@ deps = pytest-rerunfailures coverage hypothesis<=6.72.0 -commands +commands = pytest --reruns 5 [testenv:report] From 9fa73a573ae07c2de6fe558b6ac69dc6dcf8c2bd Mon Sep 17 00:00:00 2001 From: Abhimanyu Susobhanan Date: Fri, 6 Dec 2024 21:28:12 +0100 Subject: [PATCH 4/6] cleanup --- CHANGELOG-unreleased.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG-unreleased.md b/CHANGELOG-unreleased.md index bdf8d466d..140adcef0 100644 --- a/CHANGELOG-unreleased.md +++ b/CHANGELOG-unreleased.md @@ -20,9 +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 From b75c94669dd044a29411a40557dc0faa2a9ba73f Mon Sep 17 00:00:00 2001 From: Abhimanyu Susobhanan Date: Tue, 10 Dec 2024 10:06:48 +0100 Subject: [PATCH 5/6] reruns for macos --- .github/workflows/ci_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index e550e50d4..dc096a29c 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -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 \ No newline at end of file From 38dd5118bb2cfa36e5bc20c8ec97bcf3ae6ae981 Mon Sep 17 00:00:00 2001 From: Abhimanyu Susobhanan Date: Tue, 10 Dec 2024 10:09:20 +0100 Subject: [PATCH 6/6] cleanup --- CHANGELOG-unreleased.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG-unreleased.md b/CHANGELOG-unreleased.md index f95d81a8d..575b8ebca 100644 --- a/CHANGELOG-unreleased.md +++ b/CHANGELOG-unreleased.md @@ -22,7 +22,6 @@ the released changes. - `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. - When EQUAD is created from TNEQ, has proper TCB->TDB conversion info