From 02c1e0c51d73231dea76fa11ba266fd74a01d3b9 Mon Sep 17 00:00:00 2001 From: Felix Oesterle <6945681+fso42@users.noreply.github.com> Date: Mon, 20 Oct 2025 13:44:04 +0200 Subject: [PATCH] refactor(deps): Restricted `numpy` to `<2` and added `salib<1.5.1` to dependencies - Due to problems on WLV machines with qgis 3.22 and 3.44 --- pyproject.toml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a4210dcb9..38a5cb5df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,8 @@ classifiers = [ ] requires-python = ">=3.9" dependencies = [ - "numpy", + "numpy<2", + "salib<1.5.1", "matplotlib", "pyshp", "scipy", @@ -43,7 +44,6 @@ dependencies = [ "contextily", "geopandas", "fiona", - "salib" ] # Setuptools @@ -85,10 +85,18 @@ line-length = 109 channels = ["https://prefix.dev/conda-forge"] platforms = ["linux-64", "win-64", "osx-64"] +[too.pixi.target.osx-64.dependencies] +numpy = "*" + [tool.pixi.dependencies] setuptools = "*" setuptools-scm = "*" cibuildwheel = "*" +# FSO: remove as soon as possible +#gdal = "*" +libgdal = "*" +#geos = "*" +#proj = "*" # Feature dev [tool.pixi.feature.dev.pypi-dependencies] @@ -109,15 +117,19 @@ sphinxcontrib-bibtex = "*" #Feature prod [tool.pixi.feature.prod.pypi-dependencies] -avaframe = "*" +#avaframe = "*" + +#Feature py313 +[tool.pixi.feature.py313.dependencies] +python = "==3.13.7" #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] -qgis = "*" +#qgis = "*" #Environments [tool.pixi.environments] @@ -125,6 +137,7 @@ default = { features = ["dev"], solve-group = "default" } dev = ["dev"] doc = ["doc", "dev"] prod = ["prod"] -rcs = ["rcs"] +#rcs = ["rcs"] +py313 = ["py313","dev"] qgis = ["qgis", "dev"]