From 950e06fc07c7d3b4f2b7bbc0453b369af35e08b4 Mon Sep 17 00:00:00 2001 From: Felix Oesterle Date: Mon, 13 Oct 2025 21:02:58 +0200 Subject: [PATCH] chore(deps): add temporary dependencies `gdal`, `libgdal`, `geos`, `proj` in `pyproject.toml` - REMOVE AT LATER STAGE AGAIN - Rason: the installation of geopandas failed on github action with missing gdal info refactor(pyproject): comment out unused `avaframe` dependency in `rcs` configuration chore(deps, github-actions): update `setup-pixi` to v0.9.1 and comment out unused `rcs` dependencies in `pyproject.toml` chore(github-actions): update `actions/checkout` to v5 and adjust indentation in `runTestSinglePython.yml` --- .github/workflows/runTestSinglePython.yml | 26 +++++++++++------------ pyproject.toml | 11 +++++++--- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/runTestSinglePython.yml b/.github/workflows/runTestSinglePython.yml index 8364cf24f..5d60600ac 100644 --- a/.github/workflows/runTestSinglePython.yml +++ b/.github/workflows/runTestSinglePython.yml @@ -20,16 +20,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: prefix-dev/setup-pixi@v0.8.3 - with: - cache: false - - name: Pixi run pytest - run: | - pixi run pytest -ra --cov --cov-report=xml --cov-report lcov:cov.info --cov-config=.coveragerc - - uses: qltysh/qlty-action/coverage@main - with: - coverage-token: ${{secrets.QLTY_COVERAGE_TOKEN}} - files: cov.info + - uses: actions/checkout@v5 + with: + fetch-depth: 0 + - uses: prefix-dev/setup-pixi@v0.9.1 + with: + cache: false + - name: Pixi run pytest + run: | + pixi run pytest -ra --cov --cov-report=xml --cov-report lcov:cov.info --cov-config=.coveragerc + - uses: qltysh/qlty-action/coverage@main + with: + coverage-token: ${{secrets.QLTY_COVERAGE_TOKEN}} + files: cov.info diff --git a/pyproject.toml b/pyproject.toml index a4210dcb9..cdff1d1b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,6 +89,11 @@ platforms = ["linux-64", "win-64", "osx-64"] setuptools = "*" setuptools-scm = "*" cibuildwheel = "*" +# FSO: remove as soon as possible +gdal = "*" +libgdal = "*" +geos = "*" +proj = "*" # Feature dev [tool.pixi.feature.dev.pypi-dependencies] @@ -112,8 +117,8 @@ sphinxcontrib-bibtex = "*" avaframe = "*" #Feature rcs -[tool.pixi.feature.rcs.pypi-dependencies] -avaframe = "==1.13rc4" +#[tool.pixi.feature.rcs.pypi-dependencies] +#avaframe = "==1.13rc4" #Feature qgis [tool.pixi.feature.qgis.dependencies] @@ -125,6 +130,6 @@ default = { features = ["dev"], solve-group = "default" } dev = ["dev"] doc = ["doc", "dev"] prod = ["prod"] -rcs = ["rcs"] +#rcs = ["rcs"] qgis = ["qgis", "dev"]