From 626fc5c8a9a9aed4fb0498e0b41dc5d62dc9b631 Mon Sep 17 00:00:00 2001 From: Chris Navarro Date: Mon, 2 Dec 2024 14:36:55 -0600 Subject: [PATCH 1/2] Fixes #636 Updated rasterio dependency to the latest to fetch correct GDAL version (#637) --- CHANGELOG.md | 6 ++++++ environment.yml | 2 +- recipes/meta.yaml | 2 +- requirements.min | 2 +- setup.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 031bafae..dc19653b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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 +- 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 index 8b124882..0a6f14d6 100644 --- 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 index 8b893bc0..0c27bc11 100644 --- 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 index c392a68b..613cbe81 100644 --- 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 index 705de3dc..25b38c49 100644 --- 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", From 3ca707224226aaf56358233612d043555f6136a0 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Mon, 2 Dec 2024 14:40:55 -0600 Subject: [PATCH 2/2] Fix GitHub action error in posting the container when merged to main (#633) * Fixed github action error on publishing the container when merging to main branch * finished the test and put the code back to work with main branch --------- Co-authored-by: Chen Wang --- .github/workflows/doc.yaml | 6 ++++++ CHANGELOG.md | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/doc.yaml b/.github/workflows/doc.yaml index 1af6592f..284944e1 100644 --- 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/Publish-Docker-Github-Action@3.04 diff --git a/CHANGELOG.md b/CHANGELOG.md index dc19653b..2e920d48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ 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)