Skip to content

Commit

Permalink
Merge branch 'develop' into 631-fix-github-action-error-in-posting-th…
Browse files Browse the repository at this point in the history
…e-container-when-merged-to-main
  • Loading branch information
longshuicy authored Dec 2, 2024
2 parents 55a4d9f + 626fc5c commit ce897d1
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### 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

Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion recipes/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.min
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit ce897d1

Please sign in to comment.