Merge remote-tracking branch 'upstream/main' into fix_homogenize

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/pre-commit.yml

@@ -10,6 +10,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
     - uses: pre-commit/action@v3.0.0

.github/workflows/python-publish.yml

@@ -24,7 +24,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.11'
     - name: Install dependencies

.github/workflows/python-tests.yml

@@ -25,11 +25,11 @@ jobs:
         shell: bash -l {0}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # We initiate the environment empty, and check if a key for this environment doesn't already exist in the cache
     - name: Initiate empty environment
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         miniforge-variant: Mambaforge
         miniforge-version: latest
@@ -45,7 +45,7 @@ jobs:
       shell: bash
 
     - name: Cache conda env
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ env.CONDA }}/envs
         key: conda-${{ matrix.os }}-${{ matrix.python-version }}-${{ env.cache_date }}-${{ hashFiles('dev-environment.yml') }}-${{ env.CACHE_NUMBER }}

.pre-commit-config.yaml

@@ -1,3 +1,6 @@
+ci:
+    autofix_prs: false
+    autoupdate_schedule: quarterly
 repos:
         - repo: https://github.com/pre-commit/pre-commit-hooks
           rev: v4.3.0

dev-environment.yml

@@ -2,18 +2,16 @@ name: xdem-dev
 channels:
   - conda-forge
 dependencies:
-  - python>=3.9
-  - geopandas>=0.10.0
-  - fiona
-  - shapely
-  - numba
-  - numpy
-  - matplotlib
-  - pyproj>=3.4
-  - rasterio>=1.3
-  - scipy
+  - python>=3.9,<3.12
+  - geopandas>=0.12.0,<0.14
+  - numba=0.*
+  - numpy=1.*
+  - matplotlib=3.*
+  - pyproj>=3.4,<4
+  - rasterio>=1.3,<2
+  - scipy=1.*
   - tqdm
-  - scikit-image
+  - scikit-image=0.*
   - scikit-gstat>=1.0
 #  - geoutils=0.0.15
 
@@ -35,7 +33,7 @@ dependencies:
 
   # Doc dependencies
   - sphinx
-  - pydata-sphinx-theme==0.13.3
+  - pydata-sphinx-theme
   - sphinx-book-theme>=1.0
   - sphinxcontrib-programoutput
   - sphinx-design

environment.yml

@@ -2,18 +2,16 @@ name: xdem
 channels:
   - conda-forge
 dependencies:
-  - python>=3.9
-  - geopandas>=0.10.0
-  - fiona
-  - shapely
-  - numba
-  - numpy
-  - matplotlib
-  - pyproj>=3.4
-  - rasterio>=1.3
-  - scipy
+  - python>=3.9,<3.12
+  - geopandas>=0.12.0,<0.14
+  - numba=0.*
+  - numpy=1.*
+  - matplotlib=3.*
+  - pyproj>=3.4,<4
+  - rasterio>=1.3,<2
+  - scipy=1.*
   - tqdm
-  - scikit-image
+  - scikit-image=0.*
   - scikit-gstat>=1.0
 #  - geoutils=0.0.15
   - pip

requirements.txt

@@ -1,17 +1,15 @@
 # This file is auto-generated from environment.yml, do not modify.
 # See that file for comments about the need/usage of each dependency.
 
-geopandas>=0.10.0
-fiona
-shapely
-numba
-numpy
-matplotlib
-pyproj>=3.4
-rasterio>=1.3
-scipy
+geopandas>=0.12.0,<0.14
+numba==0.*
+numpy==1.*
+matplotlib==3.*
+pyproj>=3.4,<4
+rasterio>=1.3,<2
+scipy==1.*
 tqdm
-scikit-image
+scikit-image==0.*
 scikit-gstat>=1.0
 geoutils==0.0.15
 pip