From 838cca44a410e9bb2c6df890e5617ab4bb9612e5 Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Thu, 21 May 2026 09:15:47 +0200 Subject: [PATCH 1/5] CI: formally test agains python 3.14 --- .github/workflows/tests.yaml | 4 +++- ci/314.yaml | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 ci/314.yaml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3f733ca..1fdf3d1 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] - environment-file: [ci/313.yaml] + environment-file: [ci/314.yaml] include: - environment-file: ci/310.yaml os: ubuntu-latest @@ -25,6 +25,8 @@ jobs: os: ubuntu-latest - environment-file: ci/312.yaml os: ubuntu-latest + - environment-file: ci/313.yaml + os: ubuntu-latest - environment-file: ci/dev.yaml os: ubuntu-latest defaults: diff --git a/ci/314.yaml b/ci/314.yaml new file mode 100644 index 0000000..76d9ae0 --- /dev/null +++ b/ci/314.yaml @@ -0,0 +1,28 @@ +name: xvec +channels: + - conda-forge +dependencies: + - python=3.14 + # required + - shapely >=2 + - xarray + - rioxarray + - joblib + - rasterio + - tqdm + - pyproj + # testing + - pytest + - pytest-cov + - pytest-xdist + - pytest-reportlog + - geopandas-base + - geodatasets + - pyogrio + - xproj + - matplotlib + - scipy + - netCDF4 + - pip + - pip: + - exactextract \ No newline at end of file From 9a5aaef80ca68296e2d7f65dad19f1218e16d79e Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Thu, 21 May 2026 09:29:04 +0200 Subject: [PATCH 2/5] debug windows --- .github/workflows/tests.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 1fdf3d1..702b2cf 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -32,6 +32,8 @@ jobs: defaults: run: shell: bash -l {0} + permissions: + issues: write steps: - name: checkout repo @@ -48,7 +50,7 @@ jobs: - name: run tests id: status - run: pytest -v . --cov=xvec --cov-append --cov-report term-missing --cov-report xml --color=yes --report-log pytest-log.jsonl + run: pytest -v . --cov=xvec --cov-append --cov-report term-missing --cov-report xml --color=yes - name: run mypy if: contains(matrix.environment-file, 'ci/312.yaml') && contains(matrix.os, 'ubuntu') @@ -62,6 +64,6 @@ jobs: && steps.status.outcome == 'failure' && github.event_name == 'schedule' && github.repository_owner == 'xarray-contrib' - uses: xarray-contrib/issue-from-pytest-log@v1 + uses: scientific-python/issue-from-pytest-log@v1 with: log-path: pytest-log.jsonl From b033ee2aa8f9fb5899fac9102f83fcc911846757 Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Thu, 21 May 2026 09:40:46 +0200 Subject: [PATCH 3/5] another debug run --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 702b2cf..97d7e58 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -50,7 +50,7 @@ jobs: - name: run tests id: status - run: pytest -v . --cov=xvec --cov-append --cov-report term-missing --cov-report xml --color=yes + run: pytest -v . - name: run mypy if: contains(matrix.environment-file, 'ci/312.yaml') && contains(matrix.os, 'ubuntu') From 8164bd48b9838fe879a2175e648b6b870a72f9e1 Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Thu, 21 May 2026 09:50:06 +0200 Subject: [PATCH 4/5] get exactextract from conda --- ci/313.yaml | 3 +-- ci/314.yaml | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ci/313.yaml b/ci/313.yaml index 4f75832..30ec868 100644 --- a/ci/313.yaml +++ b/ci/313.yaml @@ -9,6 +9,7 @@ dependencies: - rioxarray - joblib - rasterio + - exactextract - tqdm - pyproj # testing @@ -24,5 +25,3 @@ dependencies: - scipy - netCDF4 - pip - - pip: - - exactextract \ No newline at end of file diff --git a/ci/314.yaml b/ci/314.yaml index 76d9ae0..78e28a8 100644 --- a/ci/314.yaml +++ b/ci/314.yaml @@ -9,6 +9,7 @@ dependencies: - rioxarray - joblib - rasterio + - exactextract - tqdm - pyproj # testing @@ -22,7 +23,4 @@ dependencies: - xproj - matplotlib - scipy - - netCDF4 - pip - - pip: - - exactextract \ No newline at end of file From 865da0b1ad34fc75f032d0ec24292634b873f7dc Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Thu, 21 May 2026 09:50:25 +0200 Subject: [PATCH 5/5] revert debugging --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 97d7e58..0cccf6c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -50,7 +50,7 @@ jobs: - name: run tests id: status - run: pytest -v . + run: pytest -v . --cov=xvec --cov-append --cov-report term-missing --cov-report xml --color=yes --report-log pytest-log.jsonl - name: run mypy if: contains(matrix.environment-file, 'ci/312.yaml') && contains(matrix.os, 'ubuntu')