Skip to content

Commit

Permalink
Update dependencies (#1097)
Browse files Browse the repository at this point in the history
  • Loading branch information
savente93 authored Oct 23, 2024
1 parent 416c889 commit da8484e
Show file tree
Hide file tree
Showing 10 changed files with 13,764 additions and 13,707 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-data-catalogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v3
- uses: prefix-dev/[email protected]
with:
pixi-version: "v0.21.1"
pixi-version: "v0.34.0"
environments: min-py311
- name: Prepare pixi
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
fetch-depth: 0
- uses: prefix-dev/[email protected]
with:
pixi-version: "v0.21.1"
pixi-version: "v0.34.0"
environments: full-py311

- name: Generate docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions/checkout@v4
- uses: prefix-dev/[email protected]
with:
pixi-version: "v0.21.1"
pixi-version: "v0.34.0"
environments: full-py311
- name: Prepare pixi
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pixi_auto_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
- uses: prefix-dev/[email protected]
with:
pixi-version: "v0.21.1"
pixi-version: "v0.34.0"
cache: false
- name: Update pixi lock file
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- uses: actions/checkout@v4
- uses: prefix-dev/[email protected]
with:
pixi-version: "v0.21.1"
pixi-version: "v0.34.0"
environments: full-py${{ matrix.python-version }}
- name: Prepare pixi
run: |
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
FROM debian:bookworm-slim AS base
ARG PIXIENV
RUN apt-get update && apt-get install -y curl
RUN apt-get update && apt-get install -y curl && apt clean && useradd deltares

RUN useradd deltares
USER deltares
WORKDIR /home/deltares

RUN curl --proto="https" -fsSL https://pixi.sh/install.sh | bash
RUN curl --proto "=https" -fsSL https://pixi.sh/install.sh | bash
ENV PATH=/home/deltares/.pixi/bin:$PATH
COPY pixi.toml pixi.lock pyproject.toml README.rst ./
COPY data/ ./data
Expand Down
3 changes: 2 additions & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ New

Changed
-------
- Rasterio have as been limited to ``<1.4.0`` (#1097)

Fixed
-----
- Fixed incorrect arguments causing crashes in geom_component._region_data() (#1091)
- Fixed incorrect arguments causing crashes in ``geom_component._region_data()`` (#1091)

Deprecated
----------
Expand Down
27,449 changes: 13,753 additions & 13,696 deletions pixi.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ pyogrio = ">=0.6"
pyproj = "*"
pystac = "*"
pyyaml = "*"
rasterio = "*"
rasterio = "<1.4.0"
requests = "*"
rioxarray = "*"
scipy = "*"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies = [
"pyproj", # projections for Coordinate reference systems
"pystac", # STAC integration
"pyyaml", # yaml interface
"rasterio", # raster wrapper around gdal
"rasterio<1.4.0", # raster wrapper around gdal
"requests", # donwload stuff
"rioxarray", # wraps rasterio and xarray. Almost superceded by hydromt/raster.py
"scipy", # scientific utilities
Expand Down

0 comments on commit da8484e

Please sign in to comment.