Skip to content

Commit 2939ce7

Browse files
authored
Merge pull request #241 from jGaboardi/try_python_314_ci
Python 3.14 in CI matrix etc
2 parents 8330393 + 5906c9f commit 2939ce7

File tree

9 files changed

+49
-27
lines changed

9 files changed

+49
-27
lines changed

.github/workflows/build_docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
strategy:
1313
matrix:
1414
os: ['ubuntu-latest']
15-
environment-file: [ci/312.yml]
15+
environment-file: [ci/314-latest.yml]
1616
experimental: [false]
1717
defaults:
1818
run:
1919
shell: bash -l {0}
2020

2121
steps:
2222
- name: Checkout repo
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 0 # Fetch all history for all branches and tags.
2626

2727
- name: Setup micromamba
28-
uses: mamba-org/setup-micromamba@v1
28+
uses: mamba-org/setup-micromamba@v2
2929
with:
3030
environment-file: ${{ matrix.environment-file }}
3131
micromamba-version: 'latest'
@@ -54,4 +54,4 @@
5454
branch: gh-pages
5555
directory: gh-pages
5656
github_token: ${{ secrets.GITHUB_TOKEN }}
57-
force: true
57+
force: true

.github/workflows/unittests.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,18 @@
2626
os: [ubuntu-latest]
2727
environment-file: [
2828
ci/311-oldest.yml,
29-
ci/311.yml,
30-
ci/312.yml,
31-
ci/313.yml,
32-
ci/313-dev.yml,
29+
ci/311-latest.yml,
30+
ci/312-latest.yml,
31+
ci/313-latest.yml,
32+
ci/314-latest.yml,
33+
ci/314-dev.yml,
3334
]
3435
include:
35-
- environment-file: ci/312.yml
36+
- environment-file: ci/314-latest.yml
3637
os: macos-15-intel # Intel
37-
- environment-file: ci/312.yml
38+
- environment-file: ci/314-latest.yml
3839
os: macos-latest # Apple Silicon
39-
- environment-file: ci/312.yml
40+
- environment-file: ci/314-latest.yml
4041
os: windows-latest
4142
fail-fast: false
4243

@@ -46,12 +47,12 @@
4647

4748
steps:
4849
- name: checkout repo
49-
uses: actions/checkout@v4
50+
uses: actions/checkout@v6
5051
with:
5152
fetch-depth: 0 # Fetch all history for all branches and tags.
5253

5354
- name: setup micromamba
54-
uses: mamba-org/setup-micromamba@v1
55+
uses: mamba-org/setup-micromamba@v2
5556
with:
5657
environment-file: ${{ matrix.environment-file }}
5758
micromamba-version: 'latest'
@@ -88,7 +89,7 @@
8889
--cov-report xml .
8990
9091
- name: codecov
91-
uses: codecov/codecov-action@v4
92+
uses: codecov/codecov-action@v5
9293
with:
9394
token: ${{ secrets.CODECOV_TOKEN }}
9495

.github/workflows/upload_package.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout repo
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v6
2323

2424
- name: Set up python
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v6
2626
with:
2727
python-version: "3.x"
2828

@@ -34,7 +34,7 @@ jobs:
3434
twine check --strict dist/*
3535
3636
- name: Create Release Notes
37-
uses: actions/github-script@v6
37+
uses: actions/github-script@v8
3838
with:
3939
github-token: ${{secrets.GITHUB_TOKEN}}
4040
script: |
@@ -47,4 +47,4 @@ jobs:
4747
uses: pypa/gh-action-pypi-publish@release/v1
4848
with:
4949
user: __token__
50-
password: ${{ secrets.PYPI_PASSWORD }}
50+
password: ${{ secrets.PYPI_PASSWORD }}

ci/311.yml renamed to ci/311-latest.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ dependencies:
2121
- tqdm
2222
- codecov
2323
- coverage
24-
- pip
2524
- pytest
2625
- pytest-cov
2726
- pytest-mpl

ci/311-oldest.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dependencies:
2222
- tqdm=4.67
2323
- codecov
2424
- coverage
25-
- pip
2625
- pytest
2726
- pytest-cov
2827
- pytest-mpl

ci/312-latest.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.12
6+
- astropy
7+
- dask
8+
- dask-geopandas
9+
- geopandas
10+
- h3-py<4
11+
- joblib
12+
- jupyterlab
13+
- libpysal
14+
- numpy
15+
- pandas
16+
- rasterio
17+
- rasterstats
18+
- scikit-learn
19+
- scipy
20+
- statsmodels
21+
- tqdm
22+
- codecov
23+
- coverage
24+
- pytest
25+
- pytest-cov
26+
- pytest-mpl
27+
- pytest-xdist

ci/313.yml renamed to ci/313-latest.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ dependencies:
2121
- tqdm
2222
- codecov
2323
- coverage
24-
- pip
2524
- pytest
2625
- pytest-cov
2726
- pytest-mpl

ci/313-dev.yml renamed to ci/314-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: test
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.13
5+
- python=3.14
66
- astropy
77
- dask
88
- h3-py

ci/312.yml renamed to ci/314-latest.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: test
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.12
5+
- python=3.14
66
- astropy
77
- dask
88
- dask-geopandas
99
- geopandas
10-
- h3-py<4
10+
- h3-py
1111
- joblib
1212
- jupyterlab
1313
- libpysal
@@ -21,7 +21,6 @@ dependencies:
2121
- tqdm
2222
- codecov
2323
- coverage
24-
- pip
2524
- pytest
2625
- pytest-cov
2726
- pytest-mpl
@@ -38,5 +37,3 @@ dependencies:
3837
- sphinx-autodoc2
3938
- nbsphinx-link
4039
- linkify-it-py
41-
- pip:
42-
- nbsphinx-link>=1.3.1 # not on conda yet

0 commit comments

Comments
 (0)