Merge branch 'develop' into calibrate-impact-functions

Author: peanutfun

.github/scripts/setup_devbranch.py

@@ -104,8 +104,9 @@ def setup_devbranch():
     Just changes files, all `git` commands are in the setup_devbranch.sh file.
     """
     main_version = get_last_version().strip('v')
-
-    dev_version = f"{main_version}-dev"
+    semver = main_version.split(".")
+    semver[-1] = f"{int(semver[-1]) + 1}-dev"
+    dev_version = ".".join(semver)
 
     update_setup(dev_version)
     update_version(dev_version)

.github/workflows/ci.yml

@@ -0,0 +1,70 @@
+name: GitHub CI
+
+# Execute this for every push
+on: [push]
+
+# Use bash explicitly for being able to enter the conda environment
+defaults:
+  run:
+    shell: bash -l {0}
+
+jobs:
+  build-and-test:
+    name: Build Env, Install, Unit Tests
+    runs-on: ubuntu-latest
+    permissions:
+      # For publishing results
+      checks: write
+
+    # Run this test for different Python versions
+    strategy:
+      # Do not abort other tests if only a single one fails
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11"]
+
+    steps:
+      -
+        name: Checkout Repo
+        uses: actions/checkout@v3
+      -
+        # Store the current date to use it as cache key for the environment
+        name: Get current date
+        id: date
+        run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}"
+      -
+        name: Create Environment with Mamba
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-name: climada_env_${{ matrix.python-version }}
+          environment-file: requirements/env_climada.yml
+          create-args: >-
+            python=${{ matrix.python-version }}
+            make
+          init-shell: >-
+            bash
+          # Persist environment for branch, Python version, single day
+          cache-environment-key: env-${{ github.ref }}-${{ matrix.python-version }}-${{ steps.date.outputs.date }}
+      -
+        name: Install CLIMADA
+        run: |
+          python -m pip install ".[test]"
+      -
+        name: Run Unit Tests
+        run: |
+          make unit_test
+      -
+        name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          junit_files: tests_xml/tests.xml
+          check_name: "Unit Test Results Python ${{ matrix.python-version }}"
+          comment_mode: "off"
+      -
+        name: Upload Coverage Reports
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-report-unittests-py${{ matrix.python-version }}
+          path: coverage/

CHANGELOG.md

@@ -29,11 +29,11 @@ install_test : ## Test installation was successful
 
 .PHONY : data_test
 data_test : ## Test data APIs
-	python test_data_api.py
+	python script/jenkins/test_data_api.py
 
 .PHONY : notebook_test
 notebook_test : ## Test notebooks in doc/tutorial
-	python test_notebooks.py
+	python script/jenkins/test_notebooks.py report
 
 .PHONY : integ_test
 integ_test : ## Integration tests execution with xml reports

Makefile

@@ -28,7 +28,7 @@
 GSDP_DIR = SYSTEM_DIR.joinpath('GSDP')
 
 REPO_DATA = {
-    'data/system': [
+    'climada/data/system': [
         ISIMIP_GPWV3_NATID_150AS,
         GLB_CENTROIDS_MAT,
         ENT_TEMPLATE_XLS,
@@ -44,12 +44,12 @@
         SYSTEM_DIR.joinpath('tc_impf_cal_v01_EDR.csv'),
         SYSTEM_DIR.joinpath('tc_impf_cal_v01_RMSF.csv'),
     ],
-    'data/system/GSDP': [
+    'climada/data/system/GSDP': [
         GSDP_DIR.joinpath(f'{cc}_GSDP.xls')
         for cc in ['AUS', 'BRA', 'CAN', 'CHE', 'CHN', 'DEU', 'FRA', 'IDN', 'IND', 'JPN', 'MEX',
                    'TUR', 'USA', 'ZAF']
     ],
-    'data/demo': [
+    'climada/data/demo': [
         ENT_DEMO_TODAY,
         ENT_DEMO_FUTURE,
         EXP_DEMO_H5,