Merge branch 'develop' into main

# Conflicts:
#	climada/hazard/centroids/centr.py
#	climada/hazard/tc_tracks.py
#	climada/util/coordinates.py
#	climada/util/test/test_coordinates.py
#	doc/climada/climada.entity.exposures.rst
#	doc/climada/climada.entity.impact_funcs.rst
#	doc/climada/climada.hazard.rst
#	doc/guide/developer.rst
#	requirements/env_docs.yml

resolved using develop

Author: schmide

.gitignore

@@ -1,3 +1,6 @@
+# Hidden Files
+.*
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -47,6 +50,18 @@ coverage.xml
 *.cover
 .hypothesis/
 
+# Temporary data generated by unit tests
+climada/engine/test/data/test.csv
+climada/engine/test/data/test.xlsx
+climada/engine/test/data/test_imp_mat.npz
+climada/entity/impact_funcs/test/test_write.xlsx
+climada/hazard/test/data/test_haz.h5
+climada/hazard/test/data/tc_tracks_nc/*
+climada/test/data/1988234N13299.nc
+climada/test/data/exposure_high_47_8.h5
+climada/test/data/test_write_hazard.tif
+climada/util/test/data/save_test.pkl
+
 # Translations
 *.mo
 *.pot
@@ -107,7 +122,55 @@ venv.bak/
 # mac finder files
 .DS_Store
 
+# directory with input data for hazard emulator tutorial 
+data/emulator
+
 # climada system data files
 # they get downloaded separately from the repo
 data/system/global_coast*
 data/system/global_country*
+data/system/tmp_elevation.tif
+
+# climada system data files: Nightlight and population data
+data/system/BlackMarble*tif
+data/system/*stable_lights*.*
+data/system/gpw_v4_population_count_rev11_2015_30_sec.tif
+
+# climada system data files: IBTrACS data
+data/system/IBTrACS.ALL.v04r00.nc
+data/system/data_master_sl_short/
+
+# climada system data files: SPEI data
+data/system/spei06.nc
+
+# climada system data files: World Bank data
+data/system/OGHIST.xls
+data/system/Wealth-Accounts_CSV/
+
+# climada system data files: Credit Suisse Research institute data:
+data/system/GDP2Asset_factors_CRI_2016
+
+# climada system data files: SPAM data
+data/system/cell5m_allockey_xy.csv
+data/system/LicenseV*.pdf
+data/system/readme_global_v3r2.txt
+data/system/spam*csv
+
+# climada system data files: GPW data
+data/system/gpw-v*
+data/system/gpw_v*.tif
+
+# climada system data files: NASA distance to coast
+data/system/GMT_intermediate_coast*
+
+# climada system data files: folders for hazard and exposure data
+data/system/hazard/
+data/system/litpop/
+data/system/litpop_2014/ 
+
+# climada data: ISIMIP crop data folder:
+data/ISIMIP_crop/
+
+# climada data results folder:
+data/results/
+

.pylintrc

@@ -3,7 +3,7 @@
 # A comma-separated list of package or module names from where C extensions may
 # be loaded. Extensions are loading into the active Python interpreter and may
 # run arbitrary code
-extension-pkg-whitelist=numpy,pathos
+extension-pkg-whitelist=numpy,pathos,scipy
 
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
@@ -130,7 +130,7 @@ contextmanager-decorators=contextlib.contextmanager
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E1101 when accessed. Python regular
 # expressions are accepted.
-generated-members=numpy.*,pathos.*
+generated-members=numpy.*,pathos.*,cartopy.*,scipy.*
 
 # Tells whether missing members accessed in mixin class should be ignored. A
 # mixin class is detected if its name ends with "mixin" (case insensitive).
@@ -153,7 +153,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis. It
 # supports qualified module names, as well as Unix pattern matching.
-ignored-modules=numpy,pathos
+ignored-modules=numpy,cartopy,scipy,pathos,xarray.ufuncs,netCDF4,matplotlib.cm
 
 # Show a hint with possible names when a member name was not found. The aspect
 # of finding the hint is based on edit distance.

AUTHORS

@@ -13,3 +13,6 @@ Rachel Bungerer
 Inga Sauer
 Samuel Lüthi
 Mannie Kam
+Simona Meiler
+Alessio Ciullo
+Thomas Vogt

Makefile

@@ -24,6 +24,10 @@ install_test : ## Test installation was successful
 data_test : ## Test data APIs
 	python test_data_api.py
 
+.PHONY : notebook_test
+notebook_test : ## Test notebooks in doc/tutorial
+	python test_notebooks.py
+
 .PHONY : integ_test
 integ_test : ## Integration tests execution with xml reports
 	python -m coverage run --parallel-mode --concurrency=multiprocessing tests_runner.py integ

README.md

@@ -1,4 +1,4 @@
-[![Build Status](http://ied-wcr-jenkins.ethz.ch/buildStatus/icon?job=climada_ci)](http://ied-wcr-jenkins.ethz.ch/job/climada_ci/)
+[![Build Status](http://ied-wcr-jenkins.ethz.ch/buildStatus/icon?job=climada_branches/develop)](http://ied-wcr-jenkins.ethz.ch/job/climada_branches/)
 [![Documentation build status](https://img.shields.io/readthedocs/climada-python.svg?style=flat-square)](https://readthedocs.org/projects/climada-python/builds/)
 ![Jenkins Coverage](https://img.shields.io/jenkins/coverage/cobertura/http/ied-wcr-jenkins.ethz.ch/climada_ci_night.svg)
 
@@ -57,4 +57,4 @@ CLIMADA is free software: you can redistribute it and/or modify it under the ter
 
 CLIMADA is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details:
 
-https://github.com/CLIMADA-project/climada_python/blob/master/LICENSE
+<https://www.gnu.org/licenses/lgpl.html>

climada/__init__.py

@@ -19,7 +19,6 @@
 climada init
 """
 
-from .util.config import CONFIG, setup_conf_user, setup_logging, setup_environ
+from .util.config import CONFIG, setup_conf_user, setup_logging
 setup_conf_user()
 setup_logging(CONFIG['global']['log_level'])
-setup_environ()

climada/_version.py

@@ -1 +1 @@
-__version__ = '1.4.0'
+__version__ = '1.4.2-dev'

climada/conf/defaults.conf

@@ -1,9 +1,4 @@
 {
-    "config":
-    {
-        "env_name": "climada_env"
-    },
-
     "local_data":
     {
         "save_dir": "./results/"