Merge branch 'develop'

Author: emanuel-schmid

climada/entity/exposures/litpop/gpw_population.py

@@ -153,8 +153,8 @@ def get_gpw_file_path(gpw_version, reference_year, data_dir=SYSTEM_DIR, verbatim
                           + 'The data can be downloaded from '
                           + 'http://sedac.ciesin.columbia.edu/'
                           + 'data/collection/gpw-v4/sets/browse, '
-                          + 'e.g., https://sedac.ciesin.columbia.edu/data/'
-                          + f'set/gpw-v4-population-count-rev{gpw_version}/'
-                          + 'data-download'
-                          + '(Free NASA Earthdata login required). '
+                          + 'e.g., https://sedac.ciesin.columbia.edu/downloads/data/'
+                          + f'gpw-v4/gpw-v4-population-count-rev{gpw_version}/'
+                          + f'gpw-v4-population-count-rev{gpw_version}_2020_30_sec_tif.zip '
+                          + '(Free NASA Earthdata login required).'
                           )

climada/test/test_api_client.py

@@ -139,7 +139,7 @@ def test_get_hazard(self):
                                    properties={'country_name': 'Austria',
                                                'year_range': '2010_2030', 'climate_scenario': 'rcp26'},
                                    dump_dir=DATA_DIR)
-        self.assertEqual(np.shape(hazard.intensity), (1440, 5784))
+        self.assertEqual(np.shape(hazard.intensity), (480, 5784))
         self.assertEqual(np.unique(hazard.centroids.region_id), 40)
         self.assertEqual(np.unique(hazard.date).size, 20)
         self.assertEqual(hazard.tag.haz_type, 'RF')

doc/guide/Guide_Installation.ipynb

@@ -73,7 +73,7 @@
     "Download the environment specification file from the git repository and save it locally, then create the conda environment:\n",
     "\n",
     "```bash\n",
-    "wget https://github.com/CLIMADA-project/climada_python/raw/main/requirements/env_climada.yml\n",
+    "curl -o env_climada.yml https://raw.githubusercontent.com/CLIMADA-project/climada_python/main/requirements/env_climada.yml\n",
     "conda env create -n climada_env -f env_climada.yml\n",
     "conda activate climada_env\n",
     "```\n",

Jenkinsfile script/jenkins/branches/JenkinsfileJenkinsfile renamed to script/jenkins/branches/Jenkinsfile

@@ -10,6 +10,7 @@ pipeline {
             sh '''#!/bin/bash
             export PATH=$PATH:$CONDAPATH
             source activate climada_env
+            rm -f pylint.log
             pylint -ry climada | tee pylint.log'''
 
             recordIssues tools: [pyLint(pattern: 'pylint.log')]
@@ -21,6 +22,7 @@ pipeline {
             sh '''#!/bin/bash
             export PATH=$PATH:$CONDAPATH
             source activate climada_env
+            rm -rf tests_xml/
             python -m coverage run  tests_runner.py unit
             python -m coverage xml -o coverage.xml
             python -m coverage html -d coverage'''

script/jenkins/ci_night/Jenkinsfile

@@ -0,0 +1,38 @@
+pipeline {
+  agent any
+
+  stages {
+    stage('lint') {
+      steps {
+        sh '''#!/bin/bash
+        export PATH=$PATH:$CONDAPATH
+        source activate climada_env
+        rm -f pylint.log
+        pylint -ry climada | tee pylint.log'''
+
+        recordIssues tools: [pyLint(pattern: 'pylint.log')]
+      }
+    }
+
+    stage('integ_test') {
+      steps {
+        sh '''#!/bin/bash
+        export PATH=$PATH:$CONDAPATH
+        source activate climada_env
+        rm -rf tests_xml/
+        python -m coverage run --parallel-mode --concurrency=multiprocessing tests_runner.py unit
+        python -m coverage run --parallel-mode --concurrency=multiprocessing tests_runner.py integ
+        python -m coverage combine
+        python -m coverage xml -o coverage.xml
+        python -m coverage html -d coverage'''
+      }
+    }
+  }
+
+  post {
+    always {
+      junit 'tests_xml/*.xml'
+      cobertura coberturaReportFile: 'coverage.xml', enableNewApi: true
+    }
+  }
+}