Merge branch 'master' into build/support-python-3-12

linz · Mar 12, 2024 · 350c76d · 350c76d
2 parents 2feeb0a + 77271f0
commit 350c76d
Show file tree

Hide file tree

Showing 16 changed files with 132 additions and 394 deletions.
diff --git a/.envrc b/.envrc
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
-nix_direnv_watch_file nix ./*.nix ./*/*.nix ./*/*/*.nix ./*/*/poetry.lock ./*/*/pyproject.toml
+watch_file ./*.nix ./*/*.nix ./*/*/*.nix ./*/*/poetry.lock ./*/*/pyproject.toml
 use nix
 ln --force --no-target-directory --symbolic "$(which python)" python
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -20,15 +20,15 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup Pages
         uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0
-      - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
-      - uses: cachix/cachix-action@6a2e08b5ebf7a9f285ff57b1870a4262b06e0bee # v13
+      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
         with:
           name: linz
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
       - name: Build with Jekyll
         run: nix-shell --pure --run 'github-pages build --verbose'
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@a753861a5debcf57bf8b404356158c8e1e33150c # v2.0.0
+        uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
 
   deploy:
     if:
@@ -45,4 +45,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@13b55b33dd8996121833dbc1db458c793a334630 # v3.0.1
+        uses: actions/deploy-pages@decdde0ac072f6dcbe43649d82d9c635fff5b4e4 # v4.0.4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,15 +13,15 @@ jobs:
         with:
           fetch-depth: 0 # Enable gitlint to check all PR commit messages
 
-      - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
 
-      - uses: cachix/cachix-action@6a2e08b5ebf7a9f285ff57b1870a4262b06e0bee # v13
+      - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
         with:
           name: linz
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: Cache pre-commit
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
         with:
           path: ~/.cache/pre-commit
           key:
@@ -46,9 +46,9 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
 
-      - uses: cachix/cachix-action@6a2e08b5ebf7a9f285ff57b1870a4262b06e0bee # v13
+      - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
         with:
           name: linz
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -73,9 +73,9 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
 
-      - uses: cachix/cachix-action@6a2e08b5ebf7a9f285ff57b1870a4262b06e0bee # v13
+      - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
         with:
           name: linz
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -121,7 +121,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Cache pip packages
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
         with:
           path: ${{ matrix.pip-cache-dir }}
           key:
@@ -132,7 +132,7 @@ jobs:
             ${{ runner.os }}-pip-${{ secrets.CACHE_SEED }}-${{ matrix.python }}
 
       - name: Cache Conda packages
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
         with:
           path: ~/conda_pkgs_dir
           key:
@@ -148,7 +148,7 @@ jobs:
           echo "GDAL_VERSION=$GDAL_VERSION" >> $GITHUB_ENV
 
       - name: Setup Conda
-        uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
+        uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
         with:
           channels: conda-forge
           python-version: ${{ matrix.python }}
@@ -164,7 +164,7 @@ jobs:
       - name:
           Install Python packages on Windows runner (Workaround for
           https://github.com/python-poetry/poetry/issues/1031)
-        uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
         with:
           timeout_minutes: 9999 # Workaround for https://github.com/nick-fields/retry/issues/107
           max_attempts: 6

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -26,7 +26,6 @@ repos:
         entry: deadnix
         args: [--edit, --fail]
         files: \.nix$
-        exclude: ^nix/sources\.nix$
         language: system
         stages: [commit]
 
@@ -148,7 +147,7 @@ repos:
       - id: statix
         name: statix
         entry: statix
-        args: [check, --ignore=nix/sources.nix]
+        args: [check]
         files: \.nix$
         pass_filenames: false
         language: system

diff --git a/flooding/sentinel1_water_extraction/.envrc b/flooding/sentinel1_water_extraction/.envrc
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-nix_direnv_watch_file ../../nix ./*.nix ./poetry.lock ./pyproject.toml
+watch_file ../../nix ./*.nix ./poetry.lock ./pyproject.toml
 use nix
diff --git a/flooding/sentinel1_water_extraction/poetry.lock b/flooding/sentinel1_water_extraction/poetry.lock
diff --git a/flooding/sentinel1_water_extraction/shell.nix b/flooding/sentinel1_water_extraction/shell.nix
@@ -1,6 +1,5 @@
 let
-  sources = import ../../nix/sources.nix;
-  pkgs = import sources.nixpkgs {};
+  pkgs = import ../../nixpkgs.nix;
   python = import ../../python.nix {
     inherit pkgs;
   };

diff --git a/flooding/sentinel2_water_extraction/.envrc b/flooding/sentinel2_water_extraction/.envrc
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-nix_direnv_watch_file ../../nix ./*.nix ./poetry.lock ./pyproject.toml
+watch_file ../../nix ./*.nix ./poetry.lock ./pyproject.toml
 use nix