Skip to content

Commit efef0b8

Browse files
committed
move test file list to single external file
1 parent 257525b commit efef0b8

File tree

5 files changed

+269
-290
lines changed

5 files changed

+269
-290
lines changed

docs/conf.py

+2-38
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153

154154
# On Read the Docs and CI, download the database and build a minimal HDF5 version
155155
if ON_RTD or ON_GHA:
156-
from fiasco.util import build_hdf5_dbase, download_dbase
156+
from fiasco.util import build_hdf5_dbase, download_dbase, get_test_file_list
157157
from fiasco.util.setup_db import CHIANTI_URL, LATEST_VERSION
158158
FIASCO_HOME = pathlib.Path.home() / '.fiasco'
159159
FIASCO_HOME.mkdir(exist_ok=True, parents=True)
@@ -163,43 +163,7 @@
163163
build_hdf5_dbase(
164164
ascii_dbase_root,
165165
hdf5_dbase_root,
166-
files=[
167-
'chianti.ip',
168-
'chianti.ioneq',
169-
'sun_coronal_1992_feldman_ext.abund',
170-
'sun_coronal_1992_feldman.abund',
171-
'c_1.diparams',
172-
'c_2.diparams',
173-
'c_2.drparams',
174-
'c_2.rrparams',
175-
'c_3.diparams',
176-
'c_3.drparams',
177-
'c_3.easplups',
178-
'c_3.rrparams',
179-
'c_4.diparams',
180-
'c_4.drparams',
181-
'c_4.easplups',
182-
'c_4.rrparams',
183-
'c_5.diparams',
184-
'c_5.drparams',
185-
'c_5.rrparams',
186-
'c_6.diparams',
187-
'c_6.drparams',
188-
'c_6.rrparams',
189-
'c_7.rrparams',
190-
'fe_5.elvlc',
191-
'fe_15.elvlc',
192-
'fe_16.diparams',
193-
'fe_16.drparams',
194-
'fe_16.easplups',
195-
'fe_16.rrparams',
196-
'fe_18.elvlc',
197-
'fe_18.wgfa',
198-
'fe_18.scups',
199-
'o_6.scups',
200-
'o_6.elvlc',
201-
'o_6.wgfa',
202-
]
166+
files=get_test_file_list(),
203167
)
204168
with (FIASCO_HOME / 'fiascorc').open('w') as f:
205169
c = configparser.ConfigParser()

fiasco/conftest.py

+2-251
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from packaging.version import Version
66

7-
from fiasco.util import check_database, read_chianti_version
7+
from fiasco.util import check_database, get_test_file_list, read_chianti_version
88

99
# Force MPL to use non-gui backends for testing.
1010
try:
@@ -17,256 +17,7 @@
1717

1818
# Minimal set of CHIANTI files needed to run the tests
1919
# NOTE: need some way for this to be flexible depending on the supplied database version
20-
TEST_FILES = {
21-
'sun_coronal_1992_feldman_ext.abund',
22-
'sun_coronal_1992_feldman.abund',
23-
'sun_photospheric_2007_grevesse.abund',
24-
'chianti.ip',
25-
'chianti.ioneq',
26-
'gffgu.dat',
27-
'gffint.dat',
28-
'klgfb.dat',
29-
'itoh.dat',
30-
'hseq_2photon.dat',
31-
'heseq_2photon.dat',
32-
'verner_short.txt',
33-
'flare.dem',
34-
'h_1.elvlc',
35-
'h_1.wgfa',
36-
'h_1.scups',
37-
'h_1.diparams',
38-
'h_2.rrparams',
39-
'he_1.elvlc',
40-
'he_2.elvlc',
41-
'he_3.rrparams',
42-
'c_1.diparams',
43-
'c_2.diparams',
44-
'c_2.drparams',
45-
'c_2.rrparams',
46-
'c_3.diparams',
47-
'c_3.drparams',
48-
'c_3.easplups',
49-
'c_3.rrparams',
50-
'c_4.diparams',
51-
'c_4.drparams',
52-
'c_4.easplups',
53-
'c_4.rrparams',
54-
'c_5.diparams',
55-
'c_5.drparams',
56-
'c_5.rrparams',
57-
'c_6.diparams',
58-
'c_6.drparams',
59-
'c_6.rrparams',
60-
'c_6.elvlc',
61-
'c_6.wgfa',
62-
'c_6.scups',
63-
'c_6.psplups',
64-
'c_7.rrparams',
65-
'ca_4.rrparams',
66-
'ca_4.drparams',
67-
'ca_15.elvlc',
68-
'ca_15.wgfa',
69-
'ca_15.psplups',
70-
'ca_15.scups',
71-
'li_1.diparams',
72-
'ca_2.elvlc',
73-
'fe_2.elvlc',
74-
'fe_5.elvlc',
75-
'fe_5.diparams',
76-
'fe_5.drparams',
77-
'fe_5.rrparams',
78-
'fe_5.trparams',
79-
'fe_5.easplups',
80-
'fe_5.scups',
81-
'fe_5.wgfa',
82-
'fe_6.elvlc',
83-
'fe_9.scups',
84-
'fe_9.wgfa',
85-
'fe_9.elvlc',
86-
'fe_9.fblvl',
87-
'fe_11.elvlc',
88-
'fe_11.wgfa',
89-
'fe_11.scups',
90-
'fe_11.psplups',
91-
'fe_12.elvlc',
92-
'fe_14.elvlc',
93-
'fe_14.wgfa',
94-
'fe_14.scups',
95-
'fe_14.psplups',
96-
'fe_15.elvlc',
97-
'fe_16.diparams',
98-
'fe_16.drparams',
99-
'fe_16.easplups',
100-
'fe_16.elvlc',
101-
'fe_16.scups',
102-
'fe_16.wgfa',
103-
'fe_16.rrparams',
104-
'fe_18.elvlc',
105-
'fe_18.scups',
106-
'fe_18.wgfa',
107-
'fe_27.rrparams',
108-
'fe_10.psplups',
109-
'fe_10.elvlc',
110-
'fe_20.elvlc',
111-
'fe_20.wgfa',
112-
'fe_20.scups',
113-
'fe_20.cilvl',
114-
'fe_20.reclvl',
115-
'he_2.fblvl',
116-
'he_1.fblvl',
117-
'ni_28.fblvl',
118-
'ni_17.fblvl',
119-
'ni_21.fblvl',
120-
'ni_19.fblvl',
121-
'ni_26.fblvl',
122-
'ni_18.fblvl',
123-
'ni_27.fblvl',
124-
'ni_20.fblvl',
125-
'ni_16.fblvl',
126-
'ni_11.fblvl',
127-
'ni_13.fblvl',
128-
'ni_25.fblvl',
129-
'ni_22.fblvl',
130-
'ni_23.fblvl',
131-
'ni_24.fblvl',
132-
'ni_12.fblvl',
133-
'ni_15.fblvl',
134-
'al_13.fblvl',
135-
'al_12.fblvl',
136-
'al_9.fblvl',
137-
'al_7.fblvl',
138-
'al_1.fblvl',
139-
'al_6.fblvl',
140-
'al_8.fblvl',
141-
'al_10.fblvl',
142-
'al_11.fblvl',
143-
'al_3.fblvl',
144-
'al_4.fblvl',
145-
'al_5.fblvl',
146-
'mg_7.fblvl',
147-
'mg_9.fblvl',
148-
'mg_8.fblvl',
149-
'mg_1.fblvl',
150-
'mg_6.fblvl',
151-
'mg_10.fblvl',
152-
'mg_11.fblvl',
153-
'mg_3.fblvl',
154-
'mg_4.fblvl',
155-
'mg_5.fblvl',
156-
'mg_2.fblvl',
157-
'mg_12.fblvl',
158-
'ca_17.fblvl',
159-
'ca_10.fblvl',
160-
'ca_19.fblvl',
161-
'ca_20.fblvl',
162-
'ca_18.fblvl',
163-
'ca_11.fblvl',
164-
'ca_16.fblvl',
165-
'ca_13.fblvl',
166-
'ca_14.fblvl',
167-
'ca_15.fblvl',
168-
'ca_12.fblvl',
169-
'ca_9.fblvl',
170-
'fe_10.fblvl',
171-
'fe_17.fblvl',
172-
'fe_21.fblvl',
173-
'fe_26.fblvl',
174-
'fe_19.fblvl',
175-
'fe_18.fblvl',
176-
'fe_20.fblvl',
177-
'fe_16.fblvl',
178-
'fe_11.fblvl',
179-
'fe_5.fblvl',
180-
'fe_4.fblvl',
181-
'fe_14.fblvl',
182-
'fe_13.fblvl',
183-
'fe_25.fblvl',
184-
'fe_22.fblvl',
185-
'fe_23.fblvl',
186-
'fe_24.fblvl',
187-
'fe_12.fblvl',
188-
'fe_15.fblvl',
189-
'fe_8.fblvl',
190-
'fe_6.fblvl',
191-
'fe_7.fblvl',
192-
'fe_9.fblvl',
193-
'n_3.fblvl',
194-
'n_4.fblvl',
195-
'n_5.fblvl',
196-
'n_2.fblvl',
197-
'n_7.fblvl',
198-
'n_1.fblvl',
199-
'n_6.fblvl',
200-
's_6.fblvl',
201-
's_1.fblvl',
202-
's_8.fblvl',
203-
's_9.fblvl',
204-
's_7.fblvl',
205-
's_12.fblvl',
206-
's_15.fblvl',
207-
's_14.fblvl',
208-
's_13.fblvl',
209-
's_2.fblvl',
210-
's_5.fblvl',
211-
's_4.fblvl',
212-
's_3.fblvl',
213-
's_16.fblvl',
214-
's_11.fblvl',
215-
's_10.fblvl',
216-
'o_7.fblvl',
217-
'o_6.fblvl',
218-
'o_1.fblvl',
219-
'o_8.fblvl',
220-
'o_4.fblvl',
221-
'o_3.fblvl',
222-
'o_2.fblvl',
223-
'o_5.fblvl',
224-
'h_1.fblvl',
225-
'si_12.fblvl',
226-
'si_14.fblvl',
227-
'si_13.fblvl',
228-
'si_2.fblvl',
229-
'si_5.fblvl',
230-
'si_4.fblvl',
231-
'si_3.fblvl',
232-
'si_11.fblvl',
233-
'si_10.fblvl',
234-
'si_6.fblvl',
235-
'si_1.fblvl',
236-
'si_8.fblvl',
237-
'si_9.fblvl',
238-
'si_7.fblvl',
239-
'ar_10.fblvl',
240-
'ar_17.fblvl',
241-
'ar_16.fblvl',
242-
'ar_11.fblvl',
243-
'ar_18.fblvl',
244-
'ar_4.fblvl',
245-
'ar_8.fblvl',
246-
'ar_1.fblvl',
247-
'ar_14.fblvl',
248-
'ar_13.fblvl',
249-
'ar_7.fblvl',
250-
'ar_9.fblvl',
251-
'ar_12.fblvl',
252-
'ar_15.fblvl',
253-
'ne_9.fblvl',
254-
'ne_7.fblvl',
255-
'ne_6.fblvl',
256-
'ne_1.fblvl',
257-
'ne_8.fblvl',
258-
'ne_4.fblvl',
259-
'ne_10.fblvl',
260-
'ne_3.fblvl',
261-
'ne_2.fblvl',
262-
'ne_5.fblvl',
263-
'c_5.fblvl',
264-
'c_2.fblvl',
265-
'c_3.fblvl',
266-
'c_4.fblvl',
267-
'c_1.fblvl',
268-
'c_6.fblvl',
269-
}
20+
TEST_FILES = get_test_file_list()
27021

27122

27223
@pytest.fixture(scope='session')

0 commit comments

Comments
 (0)