Add uv config

.github/workflows/ci.yml

@@ -8,14 +8,91 @@ defaults:
   run:
     shell: bash -el {0}
 
+env:
+  CLIMADA_DATA_DOI: 10.5281/zenodo.20595842
+
 jobs:
+  integration-test:
+    name: 'Core / Integration Test Pipeline'
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      -
+        name: Checkout Repo
+        uses: actions/checkout@v4
+
+      #  --- Modify paths in climada.conf ---
+      -
+        name: Write climada.conf system data
+        uses: amochkin/action-json@v1
+        with:
+          mode: write
+          file: climada.conf
+          property: local_data.system
+          value: ${{ github.workspace }}/climada/data
+      -
+        name: Write climada.conf demo data
+        uses: amochkin/action-json@v1
+        with:
+          mode: write
+          file: climada.conf
+          property: local_data.demo
+          value: ${{ github.workspace }}/climada/demo
+      -
+        run: |
+          cat climada.conf
+      # ---
+
+      -
+        name: Install make
+        uses: awalsh128/cache-apt-pkgs-action@v1
+        with:
+          packages: make
+      -
+        name: Install uv
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b  # v8.1.0
+        with:
+          python-version: "3.12"
+          cache-suffix: integrationtest
+      -
+        name: Install dependencies
+        run: |
+          uv sync --locked --dev
+      -
+        name: Cache data
+        uses: actions/cache@v5
+        with:
+          path: climada.zip
+          key: ${{ env.CLIMADA_DATA_DOI }}
+      -
+        name: Download and unzip data
+        run: |
+          uvx zenodo_get ${{ env.CLIMADA_DATA_DOI }}
+          unzip -o climada.zip -d ${{ github.workspace }}
+      -
+        name: Run Integration Tests
+        run: |
+          uv run -- make integ_test
+      -
+        name: Upload Test Results
+        if: (!cancelled())
+        uses: actions/upload-artifact@v7
+        with:
+          name: Test Results (Python ${{ matrix.python-version }})
+          path: tests_xml/tests.xml
+      -
+        name: Upload Coverage Reports
+        if: (!cancelled())
+        uses: actions/upload-artifact@v7
+        with:
+          name: Coverage Report Integration Tests (Python ${{ matrix.python-version }})
+          path: coverage/
+
   build-and-test:
     name: 'Core / Unit Test Pipeline'
     runs-on: ubuntu-latest
     timeout-minutes: 20
-    permissions:
-      # For publishing results
-      checks: write
 
     # Run this test for different Python versions
     strategy:
@@ -34,40 +111,62 @@ jobs:
         id: date
         run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}"
       -
-        name: Create Environment with Mamba
-        uses: mamba-org/setup-micromamba@v1
+        name: Install make
+        uses: awalsh128/cache-apt-pkgs-action@v1
+        with:
+          packages: make
+      -
+        name: Install Python
+        uses: actions/setup-python@v6
         with:
-          environment-name: climada_env_${{ matrix.python-version }}
-          environment-file: requirements/env_climada.yml
-          create-args: >-
-            python=${{ matrix.python-version }}
-            make
-          # Persist environment for branch, Python version, single day
-          cache-environment-key: env-${{ github.ref }}-${{ matrix.python-version }}-${{ steps.date.outputs.date }}
-      -
-        name: Install CLIMADA
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip' # caching pip dependencies
+      -
+        name: Install dependencies
         run: |
-          python -m pip install "./[dev]"
+          pip install --upgrade pip
+          pip install -e ./
+          pip install --group dev
       -
         name: Run Unit Tests
         run: |
           make unit_test
       -
-        name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        if: always()
+        name: Upload Test Results
+        if: (!cancelled())
+        uses: actions/upload-artifact@v7
         with:
-          junit_files: tests_xml/tests.xml
-          check_name: "Core / Unit Test Results (${{ matrix.python-version }})"
-          comment_mode: "off"
+          name: test-results-core-unittests-py${{ matrix.python-version }}
+          path: tests_xml/tests.xml
       -
         name: Upload Coverage Reports
-        if: always()
-        uses: actions/upload-artifact@v4
+        if: (!cancelled())
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-report-core-unittests-py${{ matrix.python-version }}
           path: coverage/
 
+  publish-test-results:
+    name: "Core / Publish Test Results"
+    needs: [build-and-test, integration-test]
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write
+    steps:
+      -
+        name: Download Test Results
+        uses: actions/download-artifact@v8
+        with:
+          pattern: test-results-core-unittests-py*
+          path: results
+      -
+        name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          files: "results/**/*.xml"
+          check_name: "Core / Test Results"
+          comment_mode: "off"
+
   test-petals:
     name: Petals Compatibility
     uses: CLIMADA-project/climada_petals/.github/workflows/testing.yml@develop

.pre-commit-config.yaml

@@ -21,3 +21,19 @@ repos:
     rev: '24.4.2'
     hooks:
       - id: black-jupyter
+
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.11.7
+    hooks:
+      - id: uv-lock
+
+  - repo: local
+    hooks:
+      - id: conda-env
+        name: Compile Conda Environment
+        entry: python script/make_conda_env.py
+        language: python
+        files: pyproject.toml
+        pass_filenames: false
+        additional_dependencies:
+          - PyYAML

.readthedocs.yml

@@ -4,23 +4,15 @@ sphinx:
   configuration: doc/conf.py
 
 build:
-  os: "ubuntu-22.04"
+  os: "ubuntu-26.04"
   tools:
-    python: "mambaforge-4.10"
-
-  # Append fixed Python version to requirements
-  jobs:
-    pre_create_environment:
-      - echo "  - python=3.11" >> requirements/env_climada.yml
-
-conda:
-  environment: requirements/env_climada.yml
+    python: "3.12"
 
 python:
   install:
-    - method: pip
-      path: .
-      extra_requirements:
+    - method: uv
+      command: sync
+      groups:
         - doc
 
 formats:

climada/entity/exposures/litpop/nightlight.py

@@ -32,7 +32,6 @@
 import rasterio
 import scipy.sparse as sparse
 from affine import Affine
-from osgeo import gdal
 from PIL import Image
 from shapefile import Shape
 
@@ -479,7 +478,7 @@ def load_nightlight_nasa(bounds, req_files, year):
             continue
         extent = np.int64(np.clip(extent, 0, tile_size[None] - 1))
         # pylint: disable=unsubscriptable-object
-        im_nl, _ = read_bm_file(SYSTEM_DIR, fname % (year))
+        im_nl = read_bm_file(SYSTEM_DIR, fname % (year))
         im_nl = np.flipud(im_nl)
         im_nl = sparse.csc.csc_matrix(im_nl)
         im_nl = im_nl[extent[0, 0] : extent[1, 0] + 1, extent[0, 1] : extent[1, 1] + 1]
@@ -512,18 +511,15 @@ def read_bm_file(bm_path, filename):
     -------
     arr1 : array
         Raw BM data
-    curr_file : gdal GeoTiff File
-        Additional info from which coordinates can be calculated.
     """
     path = Path(bm_path, filename)
     LOGGER.debug("Importing%s.", path)
     if not path.exists():
         raise FileNotFoundError(
             "Invalid path: check that the path to BlackMarble file is correct."
         )
-    curr_file = gdal.Open(str(path))
-    arr1 = curr_file.GetRasterBand(1).ReadAsArray()
-    return arr1, curr_file
+    curr_file = rasterio.open(path)
+    return curr_file.read(1)
 
 
 def unzip_tif_to_py(file_gz):

climada/test/test_litpop_integr.py

@@ -120,7 +120,7 @@ def test_switzerland30normPop_pass(self):
         self.assertIn("LitPop: Init Exposure for country: CHE", cm.output[0])
         self.assertEqual(ent.region_id.min(), 756)
         self.assertEqual(ent.region_id.max(), 756)
-        self.assertEqual(ent.value.sum(), 1.0)
+        self.assertAlmostEqual(ent.value.sum(), 1.0)
         self.assertEqual(ent.ref_year, 2015)
 
     def test_suriname30_nfw_pass(self):