sphinx configuration adapted

(cherry picked from commit ed7c57f)

Author: schmide

climada/engine/impact.py

@@ -272,7 +272,7 @@ def plot_hexbin_eai_exposure(self, mask=None, ignore_zero=True,
             axis (matplotlib.axes._subplots.AxesSubplot, optional): axis to use
             kwargs (optional): arguments for hexbin matplotlib function
 
-         Returns:
+        Returns:
             cartopy.mpl.geoaxes.GeoAxesSubplot
         """
         eai_exp = self._build_exp()
@@ -298,7 +298,7 @@ def plot_scatter_eai_exposure(self, mask=None, ignore_zero=True,
             axis (matplotlib.axes._subplots.AxesSubplot, optional): axis to use
             kwargs (optional): arguments for hexbin matplotlib function
 
-         Returns:
+        Returns:
             cartopy.mpl.geoaxes.GeoAxesSubplot
         """
         eai_exp = self._build_exp()
@@ -324,7 +324,7 @@ def plot_raster_eai_exposure(self, res=None, raster_res=None, save_tiff=None,
             axis (matplotlib.axes._subplots.AxesSubplot, optional): axis to use
             kwargs (optional): arguments for imshow matplotlib function
 
-         Returns:
+        Returns:
             cartopy.mpl.geoaxes.GeoAxesSubplot
         """
         eai_exp = self._build_exp()
@@ -353,7 +353,7 @@ def plot_basemap_eai_exposure(self, mask=None, ignore_zero=False, pop_name=True,
             kwargs (optional): arguments for scatter matplotlib function, e.g.
                 cmap='Greys'. Default: 'Wistia'
 
-         Returns:
+        Returns:
             cartopy.mpl.geoaxes.GeoAxesSubplot
         """
         eai_exp = self._build_exp()
@@ -382,7 +382,7 @@ def plot_hexbin_impact_exposure(self, event_id=1, mask=None, ignore_zero=True,
             kwargs (optional): arguments for hexbin matplotlib function
             axis (matplotlib.axes._subplots.AxesSubplot, optional): axis to use
 
-         Returns:
+        Returns:
             matplotlib.figure.Figure, cartopy.mpl.geoaxes.GeoAxesSubplot
             """
         try:
@@ -421,7 +421,7 @@ def plot_basemap_impact_exposure(self, event_id=1, mask=None, ignore_zero=True,
             kwargs (optional): arguments for scatter matplotlib function, e.g.
                 cmap='Greys'. Default: 'Wistia'
 
-         Returns:
+        Returns:
             cartopy.mpl.geoaxes.GeoAxesSubplot
         """
         try:

climada/entity/exposures/base.py

@@ -366,7 +366,7 @@ def plot_raster(self, res=None, raster_res=None, save_tiff=None,
             axis (matplotlib.axes._subplots.AxesSubplot, optional): axis to use
             kwargs (optional): arguments for imshow matplotlib function
 
-         Returns:
+        Returns:
             matplotlib.figure.Figure, cartopy.mpl.geoaxes.GeoAxesSubplot
         """
         if self.meta and self.meta['height']*self.meta['width'] == len(self):

doc/conf.py

@@ -29,8 +29,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['matplotlib.sphinxext.only_directives',
-              'matplotlib.sphinxext.plot_directive',
+extensions = ['matplotlib.sphinxext.plot_directive',
               'IPython.sphinxext.ipython_directive',
               'IPython.sphinxext.ipython_console_highlighting',
               'sphinx.ext.mathjax',

doc/guide/developer.rst

@@ -28,7 +28,7 @@ Contributions are very welcome! Please follow these steps:
 
 5. Make unit and integration **tests** on your code, preferably during development:
 
-   * Unit tests are located in the ``test`` folder located in same folder as the corresponding module. Unit tests should test all methods and functions using fake data if necessary. The whole test suit should run in less than 20 sec. They are all executed after each push in `Jenkins <http://ied-wcr-jenkins.ethz.ch/job/climada_ci/>`_.
+   * Unit tests are located in the ``test`` folder located in same folder as the corresponding module. Unit tests should test all methods and functions using fake data if necessary. The whole test suit should run in less than 20 sec. They are all executed after each push in `Jenkins <http://ied-wcr-jenkins.ethz.ch/job/climada_branches/>`_.
 
    * Integration tests are located in ``climada/test/``. They test end-to-end methods and functions. Their execution time can be of minutes. They are executed once a day in `Jenkins <http://ied-wcr-jenkins.ethz.ch/job/climada_ci_night/>`_.
 

requirements/env_docs.yml

@@ -3,56 +3,59 @@ channels:
   - defaults
 dependencies:
   - blas=1.0
-  - cartopy=0.16.0
-  - cython=0.26
-  - dill=0.2.7.1
-  - gdal
-  - geos=3.6.2
-  - geopandas=0.4.0
-  - h5py=2.7.1
+  - cartopy=0.17.0
+  - curl=7.65.3
+  - cython=0.29.7
+  - dask=1.2.2
+  - dill=0.2.9
+  - fiona=1.8.4
+  - gdal=2.3.3
+  - geos=3.7.1
+  - geopandas=0.4.1
+  - h5py=2.9.0
+  - kealib=1.4.7
+  - libtiff=4.0
+  - matplotlib=3.1.0
+  - mkl=2019.3
+  - mkl_fft=1.0.12
+  - mkl_random=1.0.2
+  - netcdf4=1.4.2
+  - numba=0.43.1
+  - numpy=1.16.3
+  - pandas=0.24.2
+  - pandas-datareader=0.7.0
+  - pip=19.1
+  - proj4=5.2.0
+  - pysocks=1.6.8
+  - pyshp=2.1.0
+  - pytables=3.5.1
+  - python=3.7.3
+  - rasterio=1.0.21
+  - requests=2.21.0
+  - scikit-learn=0.20.3
+  - scipy=1.2.1
+  - setuptools=41.0.1
+  - shapely=1.6.4
+  - tabulate=0.8.3
+  - tqdm=4.31.1
+  - xarray=0.12.1
+  - xlrd=1.2.0
+  - xlsxwriter=1.1.7
   - ipykernel=5.1.0
   - ipython=7.3.0
-  - ipython_genutils=0.2.0
-  - jsonschema=2.6.0
   - jupyter_client=5.2.4
-  - jupyter_core=4.4.0
-  - matplotlib=2.2.2
-  - mkl
-  - mkl_fft
-  - mkl_random
-  - netcdf4=1.3.1
-  - numba=0.37.0
-  - numpy=1.14.2
-  - nbconvert=5.4.1
-  - pandas=0.23.0
-  - pandas-datareader=0.6.0
-  - pandoc=1.19.2.1
-  - pip=10.0.1
-  - proj4
-  - pysocks=1.6.8
-  - pyshp=1.2.12
-  - pytables=3.4.4
-  - python=3.6.5
-  - rasterio=0.36.0
-  - requests=2.19.1
-  - scikit-learn=0.19.1
-  - scipy=1.1.0
-  - setuptools=39.1.0
-  - shapely=1.6.4
-  - sphinx=1.8.5
-  - tabulate=0.8.2
-  - tqdm=4.23.4
-  - xarray=0.10.2
-  - xlrd=1.1.0
-  - xlsxwriter=1.1.2
   - pip:
-    - contextily==0.99.0
-    - iso3166==0.9
-    - multiprocess==0.70.5
-    - nbsphinx==0.4.2
+    - contextily==1.0rc2
+    - elevation==1.0.6
+    - haversine==2.1.1
+    - iso3166==1.0
+    - multiprocess==0.70.7
+    - nbconvert==5.5.0
+    - nbformat==4.4
     - overpy==0.4
-    - pathos==0.2.1
-    - pint==0.8.1
-    - pox==0.2.5
-    - ppft==1.6.4.7.1
-
+    - pathos==0.2.3
+    - pint==0.9
+    - ppft==1.6.4.9
+    - xmlrunner==1.7.7
+    - nbsphinx==0.4.2
+    - sphinx