Skip to content

Commit f0a9e26

Browse files
authored
Merge pull request #15 from MaxBo/feature/py314
update to python 3.14
2 parents 9a01cb7 + 13fa791 commit f0a9e26

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/linux-conda.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
strategy:
1717
max-parallel: 5
1818
matrix:
19-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
19+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Setup base conda
2323
uses: conda-incubator/setup-miniconda@v3
2424
with:
25-
python-version: 3.12
25+
python-version: 3.13
2626
auto-activate-base: true
2727
activate-environment: true
2828
miniforge-version: latest
@@ -57,7 +57,7 @@ jobs:
5757
conda build --python ${{ matrix.python-version }} cythonarrays/conda.recipe
5858
5959
- name: Create Docs
60-
if: ${{ matrix.python-version == '3.12' }}
60+
if: ${{ matrix.python-version == '3.14' }}
6161
run: |
6262
eval "$(mamba shell hook --shell bash)"
6363
mamba activate test-environment
@@ -67,7 +67,7 @@ jobs:
6767
sphinx-build docs_rst ../docs
6868
6969
- name: Deploy Docs to gh-pages
70-
if: ${{ matrix.python-version == '3.12' && github.ref == 'refs/heads/master' }}
70+
if: ${{ matrix.python-version == '3.14' && github.ref == 'refs/heads/master' }}
7171
uses: JamesIves/github-pages-deploy-action@v4
7272
with:
7373
branch: gh-pages # The branch the action should deploy to.

.github/workflows/windows-conda.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
max-parallel: 5
2121
matrix:
22-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
22+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
2323
steps:
2424
- uses: actions/checkout@v4
2525
- uses: seanmiddleditch/gha-setup-vsdevenv@master
@@ -42,16 +42,16 @@ jobs:
4242
mamba install -n base "conda>=23.7" conda-build anaconda-client rattler-build twine
4343
)
4444
45-
- name: create test environments environment for python < 3.13
46-
if: ${{ matrix.python-version < '3.13' }}
45+
- name: create test environments environment for python < 3.14
46+
if: ${{ matrix.python-version < '3.14' }}
4747
run: |
4848
(
4949
mamba create -n test-wheels python=${{ matrix.python-version }} numpy
5050
mamba create -n test-conda python=${{ matrix.python-version }} numpy pytest-cov
5151
)
5252
53-
- name: create test environments for python >= 3.13
54-
if: ${{ matrix.python-version >= '3.13' }}
53+
- name: create test environments for python >= 3.14
54+
if: ${{ matrix.python-version >= '3.14' }}
5555
run: |
5656
(
5757
mamba create -n test-wheels python-gil python=${{ matrix.python-version }} numpy
@@ -111,7 +111,7 @@ jobs:
111111
)
112112
113113
- name: run code coverage
114-
if: ${{ matrix.python-version == '3.13' }}
114+
if: ${{ matrix.python-version == '3.14' }}
115115
run: |
116116
(
117117
mamba activate test-wheels
@@ -124,7 +124,7 @@ jobs:
124124
)
125125
126126
- name: Upload to Codecov
127-
if: ${{ matrix.python-version == '3.13' }}
127+
if: ${{ matrix.python-version == '3.14' }}
128128
uses: codecov/codecov-action@v3
129129
with:
130130
token: ${{ secrets.CODECOV_TOKEN }}

cythonarrays/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
88

99
[project]
1010
name = "cythonarrays"
11-
license = {text = "GPL-2.0 AND BSD-3-Clause"}
11+
license = 'GPL-2.0-or-later'
1212
dynamic = ["version"]
1313

1414
dependencies = [

0 commit comments

Comments
 (0)