Update env

visr · Dec 24, 2024 · 6e2d017 · 6e2d017
1 parent a1f0ffe
commit 6e2d017
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,8 +26,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest"] #, "macos-latest", "windows-latest"]
-        python-version: ["3.12"] # fix tests to support older versions
+        os: ["ubuntu-latest"]
+        python-version: ["3.12"]
         include:
           - os: ubuntu-latest
             label: linux-64

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.10','3.11','3.12']
+        python-version: ["3.10","3.11","3.12","3.13"]
         include:
         - os: ubuntu-latest
           label: linux-64
@@ -72,7 +72,7 @@ jobs:
         fail-fast: false
         matrix:
           os: [ubuntu-latest]
-          python-version: ['3.12']
+          python-version: ["3.13"]
           include:
           - os: ubuntu-latest
             label: linux-64
@@ -122,7 +122,7 @@ jobs:
         fail-fast: false
         matrix:
           os: [ubuntu-latest]
-          python-version: ['3.12']
+          python-version: ["3.13"]
           include:
           - os: ubuntu-latest
             label: linux-64
@@ -167,7 +167,7 @@ jobs:
         fail-fast: false
         matrix:
           os: [ubuntu-latest]
-          python-version: ['3.12']
+          python-version: ["3.12"]
           include:
           - os: ubuntu-latest
             label: linux-64

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -28,8 +28,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest"] #, "macos-latest", "windows-latest"]
-        python-version: ["3.12"] # fix tests to support older versions
+        os: ["ubuntu-latest"]
+        python-version: ["3.13"]
         include:
           - os: ubuntu-latest
             label: linux-64

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/setup-python@v4
         name: Install Python
         with:
-          python-version: '3.11'
+          python-version: "3.13"
 
       - name: generate env
         run: |
@@ -51,8 +51,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest"] #, "macos-latest", "windows-latest"]
-        python-version: ["3.11"] # fix tests to support older versions
+        os: ["ubuntu-latest"]
+        python-version: ["3.13"]
         include:
           - os: ubuntu-latest
             label: linux-64

diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   sonarcloud:
     env:
-      PYVERSION: "3.11"
+      PYVERSION: "3.13"
 
     name: SonarCloud
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         include:
           - os: ubuntu-latest
             label: linux-64

diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.12"]
+        python-version: ["3.13"]
         include:
           - os: ubuntu-latest
             label: linux-64

diff --git a/pixi.toml b/pixi.toml
@@ -1,7 +1,7 @@
 ## Global stuff
 [project]
 name = "delft_fiat"
-version = "0.1.0"
+version = "0.3.0"
 description = "Pixi for Delft-FIAT."
 authors = ["B.W. Dalmijn <[email protected]>"]
 channels = ["conda-forge"]
@@ -58,7 +58,7 @@ gdal = ">=3.5"
 numpy = "*"
 regex = "*"
 tomli = "*"
-pip = ">=24.0,<25"
+pip = ">=24.0"
 
 [feature.py310.dependencies]
 python = "3.10.*"
@@ -69,6 +69,9 @@ python = "3.11.*"
 [feature.py312.dependencies]
 python = "3.12.*"
 
+[feature.py313.dependencies]
+python = "3.13.*"
+
 [feature.all.dependencies]
 setuptools = ">=61.0.0"
 
@@ -85,7 +88,7 @@ jupyter = "*"
 jupyter-cache = "*"
 matplotlib = "*"
 pandas = "*"
-quarto = "1.3.450"
+quarto = "1.5.57"
 quartodoc = ">=0.7.6"
 
 [feature.extra.dependencies]
@@ -95,18 +98,18 @@ tomli-w = "*"
 [feature.test.dependencies]
 pytest = ">=2.7.3"
 pytest-cov = "*"
-pytest-dependency = "*"
 pytest-mock = "*"
 responses = "*"
 
 
 ## Define the environments
 [environments]
 build = { features = ["py312", "all", "build", "extra"], solve-group = "py312"}
-default = { features = ["py312", "extra"], solve-group = "py312"}
-dev = { features = ["py312", "all", "dev", "docs", "extra", "test"], solve-group = "py312" }
-docs = { features = ["py312", "all", "docs", "extra"], solve-group = "py312"}
-min = { features = ["py312"], solve-group = "py312"}
+default = { features = ["py313", "extra"], solve-group = "py313"}
+dev = { features = ["py313", "all", "dev", "docs", "extra", "test"], solve-group = "py313" }
+docs = { features = ["py313", "all", "docs", "extra"], solve-group = "py313"}
+min = { features = ["py313"], solve-group = "py313"}
+test-py313 = {features = ["py313", "all", "extra", "test"], solve-group = "py313"}
 test-py312 = {features = ["py312", "all", "extra", "test"], solve-group = "py312"}
 test-py311 = {features = ["py311", "all", "extra", "test"], solve-group = "py311"}
 test-py310 = {features = ["py310", "all", "extra", "test"], solve-group = "py310"}
diff --git a/pyproject.toml b/pyproject.toml
@@ -101,7 +101,6 @@ extra = [
 test = [
 	"pytest>=2.7.3",
 	"pytest-cov",
-    "pytest-dependency",
     "pytest-mock",
 	"responses",
     "delft_fiat[all,extra]",
@@ -118,7 +117,6 @@ fiat = "fiat.cli.main:main"
 [tool.make_env]
 channels = ["conda-forge"]
 conda_only = ["libgdal-netcdf"]
-deps_not_in_conda = ["pytest-dependency"]
 
 ## Some stuff for pytest and coverage
 [tool.pytest.ini_options]