Skip to content

Commit ea907f7

Browse files
authored
Merge pull request #18 from nabobalis/main
tidy up sunpy config
2 parents a257362 + 4cf80b2 commit ea907f7

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
.tox
2+
.hypothesis
3+
result_images
Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,32 @@
1-
[tool:pytest]
2-
testpaths = "sunpy" "docs"
3-
norecursedirs = ".tox" "build" "docs[\/]_build" "docs[\/]generated" "*.egg-info" "examples" "sunpy[/\]_dev" ".jupyter" ".history" "tools" "sunpy[\/]extern" "benchmarks"
1+
# This is a reduced config to run in this specific CI
2+
[pytest]
3+
minversion = 7.0
4+
testpaths =
5+
sunpy
6+
docs
7+
norecursedirs =
8+
.tox
9+
build
10+
docs/_build
11+
docs/generated
12+
*.egg-info
13+
examples
14+
sunpy/_dev
15+
.history
16+
tools
17+
sunpy/extern
18+
benchmarks
419
doctest_plus = enabled
520
doctest_optionflags = NORMALIZE_WHITESPACE FLOAT_CMP ELLIPSIS
6-
addopts = --dist no --arraydiff --doctest-rst --doctest-ignore-import-errors -p no:unraisableexception -p no:threadexception -m "not mpl_image_compare"
21+
addopts = --arraydiff --doctest-rst --doctest-ignore-import-errors -p no:unraisableexception -p no:threadexception -m "not mpl_image_compare"
722
asdf_schema_tests_enabled = true
823
asdf_schema_root = sunpy/io/special/asdf/resources/
9-
mpl-results-path = figure_test_images
10-
mpl-use-full-test-name = True
1124
markers =
1225
remote_data: marks this test function as needing remote data.
1326
online: marks this test function as needing online connectivity.
1427
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.
1528
flaky
1629
array_compare
17-
remote_data_strict = True
18-
# We do not care about junit_family or filterwarnings here.
30+
remote_data_strict = true
31+
filterwarnings =
32+
ignore

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ commands =
7272
reproject,all: pytest --pyargs reproject
7373
specreduce,all: pytest --pyargs specreduce
7474
specutils,all: pytest --pyargs specutils
75-
sunpy,all: pytest --pyargs sunpy -c sunpy_tst.ini
75+
sunpy,all: pytest --pyargs sunpy -c sunpy_pytest.ini

0 commit comments

Comments
 (0)