Skip to content

Commit b4eadee

Browse files
develop-black (#962)
* format * import Impact from climada.engine.impact in order to avoid circular imports * avoid circular imports
1 parent c32db0f commit b4eadee

File tree

132 files changed

+22890
-13289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+22890
-13289
lines changed

climada/__init__.py

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,63 @@
1818
1919
climada init
2020
"""
21-
from shutil import copyfile
21+
2222
from pathlib import Path
23+
from shutil import copyfile
2324

2425
from .util.config import CONFIG
2526
from .util.constants import *
2627

27-
28-
GSDP_DIR = SYSTEM_DIR.joinpath('GSDP')
28+
GSDP_DIR = SYSTEM_DIR.joinpath("GSDP")
2929

3030
REPO_DATA = {
31-
'climada/data/system': [
31+
"climada/data/system": [
3232
ISIMIP_GPWV3_NATID_150AS,
3333
GLB_CENTROIDS_MAT,
3434
ENT_TEMPLATE_XLS,
3535
HAZ_TEMPLATE_XLS,
3636
RIVER_FLOOD_REGIONS_CSV,
3737
NATEARTH_CENTROIDS[150],
3838
NATEARTH_CENTROIDS[360],
39-
SYSTEM_DIR.joinpath('WEALTH2GDP_factors_CRI_2016.csv'),
40-
SYSTEM_DIR.joinpath('GDP_TWN_IMF_WEO_data.csv'),
41-
SYSTEM_DIR.joinpath('FAOSTAT_data_country_codes.csv'),
42-
SYSTEM_DIR.joinpath('rcp_db.xls'),
43-
SYSTEM_DIR.joinpath('tc_impf_cal_v01_TDR1.0.csv'),
44-
SYSTEM_DIR.joinpath('tc_impf_cal_v01_EDR.csv'),
45-
SYSTEM_DIR.joinpath('tc_impf_cal_v01_RMSF.csv'),
39+
SYSTEM_DIR.joinpath("WEALTH2GDP_factors_CRI_2016.csv"),
40+
SYSTEM_DIR.joinpath("GDP_TWN_IMF_WEO_data.csv"),
41+
SYSTEM_DIR.joinpath("FAOSTAT_data_country_codes.csv"),
42+
SYSTEM_DIR.joinpath("rcp_db.xls"),
43+
SYSTEM_DIR.joinpath("tc_impf_cal_v01_TDR1.0.csv"),
44+
SYSTEM_DIR.joinpath("tc_impf_cal_v01_EDR.csv"),
45+
SYSTEM_DIR.joinpath("tc_impf_cal_v01_RMSF.csv"),
4646
],
47-
'climada/data/system/GSDP': [
48-
GSDP_DIR.joinpath(f'{cc}_GSDP.xls')
49-
for cc in ['AUS', 'BRA', 'CAN', 'CHE', 'CHN', 'DEU', 'FRA', 'IDN', 'IND', 'JPN', 'MEX',
50-
'TUR', 'USA', 'ZAF']
47+
"climada/data/system/GSDP": [
48+
GSDP_DIR.joinpath(f"{cc}_GSDP.xls")
49+
for cc in [
50+
"AUS",
51+
"BRA",
52+
"CAN",
53+
"CHE",
54+
"CHN",
55+
"DEU",
56+
"FRA",
57+
"IDN",
58+
"IND",
59+
"JPN",
60+
"MEX",
61+
"TUR",
62+
"USA",
63+
"ZAF",
64+
]
5165
],
52-
'climada/data/demo': [
66+
"climada/data/demo": [
5367
ENT_DEMO_TODAY,
5468
ENT_DEMO_FUTURE,
5569
EXP_DEMO_H5,
5670
HAZ_DEMO_FL,
5771
HAZ_DEMO_MAT,
5872
HAZ_DEMO_H5,
5973
TC_ANDREW_FL,
60-
DEMO_DIR.joinpath('demo_emdat_impact_data_2020.csv'),
61-
DEMO_DIR.joinpath('nl_rails.gpkg'),
62-
] + WS_DEMO_NC
74+
DEMO_DIR.joinpath("demo_emdat_impact_data_2020.csv"),
75+
DEMO_DIR.joinpath("nl_rails.gpkg"),
76+
]
77+
+ WS_DEMO_NC,
6378
}
6479

6580

@@ -68,10 +83,13 @@ def test_installation():
6883
If the invoked tests pass and an OK is printed out, the installation was successfull.
6984
"""
7085
from unittest import TestLoader, TextTestRunner
71-
suite = TestLoader().discover(start_dir='climada.engine.test',
72-
pattern='test_cost_benefit.py')
73-
suite.addTest(TestLoader().discover(start_dir='climada.engine.test',
74-
pattern='test_impact.py'))
86+
87+
suite = TestLoader().discover(
88+
start_dir="climada.engine.test", pattern="test_cost_benefit.py"
89+
)
90+
suite.addTest(
91+
TestLoader().discover(start_dir="climada.engine.test", pattern="test_impact.py")
92+
)
7593
TextTestRunner(verbosity=2).run(suite)
7694

7795

@@ -98,4 +116,5 @@ def setup_climada_data(reload=False):
98116
src = Path(__file__).parent.parent.joinpath(src_dir, path.name)
99117
copyfile(src, path)
100118

119+
101120
setup_climada_data()

climada/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '5.0.1-dev'
1+
__version__ = "5.0.1-dev"

climada/engine/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
1919
init engine
2020
"""
21-
from .impact import *
21+
2222
from .cost_benefit import *
23-
from .impact_calc import *
23+
from .impact import *
24+
from .impact_calc import *

0 commit comments

Comments
 (0)