From 6ba2580cf38059356299ed15e32d8fbea986519c Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 16 Apr 2024 13:34:40 -0700 Subject: [PATCH 1/3] tidy up sunpy config --- .gitignore | 2 ++ sunpy_tst.ini => sunpy_pytest.ini | 30 ++++++++++++++++++++++-------- tox.ini | 2 +- 3 files changed, 25 insertions(+), 9 deletions(-) rename sunpy_tst.ini => sunpy_pytest.ini (53%) diff --git a/.gitignore b/.gitignore index 172bf57..e31e2f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .tox +.hypothesis +result_images diff --git a/sunpy_tst.ini b/sunpy_pytest.ini similarity index 53% rename from sunpy_tst.ini rename to sunpy_pytest.ini index a2eb723..e79ca22 100644 --- a/sunpy_tst.ini +++ b/sunpy_pytest.ini @@ -1,18 +1,32 @@ -[tool:pytest] -testpaths = "sunpy" "docs" -norecursedirs = ".tox" "build" "docs[\/]_build" "docs[\/]generated" "*.egg-info" "examples" "sunpy[/\]_dev" ".jupyter" ".history" "tools" "sunpy[\/]extern" "benchmarks" +# This is a reduced config to run in this specific CI +[pytest] +minversion = 7.0 +testpaths = + sunpy + docs +norecursedirs = + .tox + build + docs/_build + docs/generated + *.egg-info + examples + sunpy/_dev + .history + tools + sunpy/extern + benchmarks doctest_plus = enabled doctest_optionflags = NORMALIZE_WHITESPACE FLOAT_CMP ELLIPSIS -addopts = --dist no --arraydiff --doctest-rst --doctest-ignore-import-errors -p no:unraisableexception -p no:threadexception -m "not mpl_image_compare" +addopts = --arraydiff --doctest-rst --doctest-ignore-import-errors -p no:unraisableexception -p no:threadexception -m "not mpl_image_compare" asdf_schema_tests_enabled = true asdf_schema_root = sunpy/io/special/asdf/resources/ -mpl-results-path = figure_test_images -mpl-use-full-test-name = True markers = remote_data: marks this test function as needing remote data. online: marks this test function as needing online connectivity. mpl_image_compare: marks this test function as using hash-based Matplotlib figure verification. This mark is not meant to be directly applied, but is instead automatically applied when a test function uses the @sunpy.tests.helpers.figure_test decorator. flaky array_compare -remote_data_strict = True -# We do not care about junit_family or filterwarnings here. +remote_data_strict = true +filterwarnings = + ignore diff --git a/tox.ini b/tox.ini index bfa82af..c3d12b8 100644 --- a/tox.ini +++ b/tox.ini @@ -72,4 +72,4 @@ commands = reproject,all: pytest --pyargs reproject specreduce,all: pytest --pyargs specreduce specutils,all: pytest --pyargs specutils - sunpy,all: pytest --pyargs sunpy -c sunpy_tst.ini + sunpy,all: pytest --pyargs sunpy -c sunpy_pytest.ini From c72e0c487b50d41fa7ac0be009f54f11bfaa909e Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 16 Apr 2024 14:58:23 -0700 Subject: [PATCH 2/3] NEVER MERGE --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index c3d12b8..107907d 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ pip_pre = true # Note that we install all dependencies in all environments to catch any # side effects and make sure all test suites pass with all packages deps = - astropy[all,test] + astropy[test] asdf_astropy-!dev,all-!dev: asdf_astropy[test] asdf_astropy-dev,all-dev: asdf_astropy[test] @ git+https://github.com/astropy/asdf-astropy.git @@ -54,7 +54,9 @@ deps = specutils-dev,all-dev: specutils[all,test] @ git+https://github.com/astropy/specutils.git#egg= sunpy-!dev,all-!dev: sunpy[tests,all] - sunpy-dev,all-dev: sunpy[tests,all] @ git+https://github.com/sunpy/sunpy.git + sunpy-dev,all-dev: sunpy[tests,all] @ git+https://github.com/nabobalis/sunpy.git@figures + + numpy==2.0.0rc1 skip_install = true From 4cf80b2442951d97a9725b3bea71d2e73108590c Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 16 Apr 2024 15:17:41 -0700 Subject: [PATCH 3/3] Revert "NEVER MERGE" This reverts commit c72e0c487b50d41fa7ac0be009f54f11bfaa909e. --- tox.ini | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 107907d..c3d12b8 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ pip_pre = true # Note that we install all dependencies in all environments to catch any # side effects and make sure all test suites pass with all packages deps = - astropy[test] + astropy[all,test] asdf_astropy-!dev,all-!dev: asdf_astropy[test] asdf_astropy-dev,all-dev: asdf_astropy[test] @ git+https://github.com/astropy/asdf-astropy.git @@ -54,9 +54,7 @@ deps = specutils-dev,all-dev: specutils[all,test] @ git+https://github.com/astropy/specutils.git#egg= sunpy-!dev,all-!dev: sunpy[tests,all] - sunpy-dev,all-dev: sunpy[tests,all] @ git+https://github.com/nabobalis/sunpy.git@figures - - numpy==2.0.0rc1 + sunpy-dev,all-dev: sunpy[tests,all] @ git+https://github.com/sunpy/sunpy.git skip_install = true