Merge branch 'develop' into 634-replace-production-and-dev-static-urls

IN-CORE · Dec 2, 2024 · 9508272 · 9508272
2 parents f753911 + 3ca7072
commit 9508272
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/doc.yaml b/.github/workflows/doc.yaml
@@ -51,6 +51,8 @@ jobs:
               tags="${tags},${version}"
               version=${version%.*}
             done
+            # Remove any unwanted double quotes from tags
+            tags=$(echo $tags | sed 's/"//g')
             echo "VERSION=${version}" >> $GITHUB_ENV
             echo "TAGS=${tags}" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
@@ -61,6 +63,10 @@ jobs:
             echo "TAGS=${BRANCH}" >> $GITHUB_ENV
           fi
 
+      # debug TAGS
+      - name: Debug TAGS
+        run: echo "TAGS=${{ env.TAGS }}"
+
       # build image
       - name: Build image
         uses: elgohr/[email protected]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+### Fixed
+- Documentation container tagging error by github action [#631](https://github.com/IN-CORE/pyincore/issues/631)
+- Updated rasterio dependency to the latest to fetch correct GDAL version [#636](https://github.com/IN-CORE/pyincore/issues/636)
+
+
 ## [1.20.1] - 2024-11-01
 
 ### Fixed

diff --git a/environment.yml b/environment.yml
@@ -15,7 +15,7 @@ dependencies:
   - pyproj>=3.6.1
   - pytest>=3.9.0
   - python-jose>=3.0
-  - rasterio>=1.3.9
+  - rasterio>=1.4.2
   - requests>=2.31.0
   - rtree>=1.1.0
   - scipy>=1.11.3

diff --git a/recipes/meta.yaml b/recipes/meta.yaml
@@ -49,7 +49,7 @@ requirements:
     - pandas>=2.1.2
     - pyomo>=6.0.0,<=6.6.2
     - pyproj>=3.6.1
-    - rasterio>=1.3.9
+    - rasterio>=1.4.2
     - requests>=2.31.0
     - rtree>=1.1.0
     - scipy>=1.11.3

diff --git a/requirements.min b/requirements.min
@@ -11,7 +11,7 @@ pyomo>=6.0.0,<=6.6.2
 pyproj>=3.6.1
 pytest>=3.9.0
 python-jose>=3.0
-rasterio>=1.3.9
+rasterio>=1.4.2
 requests>=2.31.0
 rtree>=1.1.0
 scipy>=1.11.3

diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@
         "pandas>=2.1.2",
         "pyomo>=6.0.0,<=6.6.2",
         "pyproj>=3.6.1",
-        "rasterio>=1.3.9",
+        "rasterio>=1.4.2",
         "rtree>=1.1.0",
         "scipy>=1.11.3",
         "shapely>=2.0.2",