Skip to content

Commit 3e8c51a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/option-appraisal-costincome
2 parents 044b7f4 + 3133447 commit 3e8c51a

1 file changed

Lines changed: 5 additions & 63 deletions

File tree

.gitignore

Lines changed: 5 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,11 @@ coverage.xml
5151
.hypothesis/
5252

5353
# Temporary data generated by unit tests
54-
climada/engine/test/data/supplychain/*
55-
climada/engine/test/data/test.csv
56-
climada/engine/test/data/test_imp_mat.npz
57-
climada/engine/test/data/test.xlsx
58-
climada/entity/impact_funcs/test/data/test_write.xlsx
59-
climada/hazard/test/data/tc_tracks_nc/*
60-
climada/hazard/test/data/tc_tracks.h5
61-
climada/hazard/test/data/test_centr.h5
62-
climada/hazard/test/data/test_haz.h5
63-
climada/hazard/test/data/test_unsupported.h5
64-
climada/test/data/1988234N13299.nc
65-
climada/test/data/exposure_buildings_default_47_7.h5
66-
climada/test/data/exposure_high_47_8.h5
67-
climada/test/data/test_write_hazard.tif
68-
climada/util/test/data/save_test.pkl
69-
climada/util/test/data/test_write_raster.tif
54+
climada/engine/test/data/
55+
climada/entity/impact_funcs/test/data/
56+
climada/hazard/test/data/
57+
climada/test/data/
58+
climada/util/test/data/
7059

7160
# Translations
7261
*.mo
@@ -128,51 +117,6 @@ venv.bak/
128117
# mac finder files
129118
.DS_Store
130119

131-
# climada system data files
132-
# they get downloaded separately from the repo
133-
data/system/global_coast*
134-
data/system/global_country*
135-
data/system/tmp_elevation.tif
136-
137-
# climada system data files: Nightlight and population data
138-
data/system/BlackMarble*tif
139-
data/system/*stable_lights*.*
140-
data/system/gpw_v4_population_count_rev11_2015_30_sec.tif
141-
142-
# climada system data files: IBTrACS data
143-
data/system/IBTrACS.ALL.v04r00.nc
144-
data/system/data_master_sl_short/
145-
146-
# climada system data files: SPEI data
147-
data/system/spei06.nc
148-
149-
# climada system data files: World Bank data
150-
data/system/OGHIST.xls
151-
data/system/Wealth-Accounts_CSV/
152-
153-
# climada system data files: Credit Suisse Research institute data:
154-
data/system/GDP2Asset_factors_CRI_2016
155-
156-
# climada system data files: SPAM data
157-
data/system/cell5m_allockey_xy.csv
158-
data/system/LicenseV*.pdf
159-
data/system/readme_global_v3r2.txt
160-
data/system/spam*csv
161-
162-
# climada system data files: GPW data
163-
data/system/gpw-v*
164-
data/system/gpw_v*.tif
165-
166-
# climada system data files: NASA distance to coast
167-
data/system/GMT_intermediate_coast*
168-
169-
# climada system data files: folders for hazard and exposure data
170-
data/system/hazard/
171-
data/system/litpop/
172-
data/system/litpop_2014/
173-
174-
# climada data: ISIMIP crop data folder:
175-
data/ISIMIP_crop/
176120

177121
# climada data results folder:
178122
results/
@@ -183,5 +127,3 @@ results/
183127
!.pylintrc
184128
!.readthedocs.yml
185129
!.github
186-
climada_petals/
187-
climada_python/

0 commit comments

Comments
 (0)