Skip to content

Commit a3b26f5

Browse files
committed
Merge branch 'topic/default/py3.14' into 'branch/default'
Topic/default/py3.14 See merge request fluiddyn/fluidfft!73
2 parents 836b2e7 + fc01ff5 commit a3b26f5

File tree

10 files changed

+6462
-5790
lines changed

10 files changed

+6462
-5790
lines changed

.github/workflows/ci-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
python-version: ["3.10", "3.11", "3.12", "3.13"]
12+
python-version: ["3.11", "3.12", "3.13", "3.14"]
1313

1414
steps:
1515

.github/workflows/ci-pixi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
shell: bash -l {0}
1717
steps:
1818
- uses: actions/checkout@v3
19-
- uses: prefix-dev/setup-pixi@v0.8.12
19+
- uses: prefix-dev/setup-pixi@v0.9.1
2020
with:
21-
pixi-version: v0.49.0
21+
pixi-version: v0.56.0
2222
cache: false
2323
- name: Install
2424
run: |

.github/workflows/wheels.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
with:
2727
python-version: 3.x
2828
- name: Build wheels
29-
uses: pypa/cibuildwheel@v2.21.3
29+
uses: pypa/cibuildwheel@v3.2.0
3030
env:
31-
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
31+
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* cp310-* *-musllinux*
3232
CIBW_ARCHS: ${{ matrix.architecture }}
3333
- uses: actions/upload-artifact@v4
3434
with:
@@ -49,9 +49,9 @@ jobs:
4949
with:
5050
python-version: 3.x
5151
- name: Build wheels
52-
uses: pypa/cibuildwheel@v2.21.3
52+
uses: pypa/cibuildwheel@v3.2.0
5353
env:
54-
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
54+
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* cp310-* *-musllinux*
5555
CIBW_ARCHS: ${{ matrix.architecture }}
5656
# increase pip debugging output
5757
# CIBW_BUILD_VERBOSITY: 2
@@ -79,9 +79,9 @@ jobs:
7979
python-version: 3.x
8080

8181
- name: Build wheels
82-
uses: pypa/cibuildwheel@v2.21.3
82+
uses: pypa/cibuildwheel@v3.2.0
8383
env:
84-
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
84+
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* cp310-* *-musllinux*
8585
CIBW_ARCHS: aarch64
8686
- uses: actions/upload-artifact@v4
8787
with:
@@ -93,7 +93,7 @@ jobs:
9393
steps:
9494
- uses: actions/checkout@v4
9595
- run: echo ${{ github.ref }}
96-
- run: python -m pip install build twine
96+
- run: python -m pip install -U build twine packaging
9797
- run: python -m build --sdist
9898
- run: twine check --strict dist/*
9999
- uses: actions/upload-artifact@v4

docker/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM python:3.10
1+
FROM python:3.11
22
LABEL Pierre Augier <[email protected]>
3+
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
34

45
RUN apt-get update
56

@@ -60,5 +61,5 @@ COPY --chown=appuser:appuser doc/install/install_pfft.sh install_pfft.sh
6061
RUN chmod +x install_pfft.sh
6162
RUN ./install_pfft.sh
6263

63-
RUN python -m pip install --upgrade pip
64-
RUN python -m pip install --upgrade pdm nox
64+
RUN uv tool install pdm
65+
RUN uv tool install nox

pdm.lock

Lines changed: 0 additions & 3521 deletions
This file was deleted.

pdm.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[lock]
2+
format = "pylock"

pixi.lock

Lines changed: 2479 additions & 2251 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install-mpi_with_fftw = "pip install -e plugins/fluidfft-mpi_with_fftw --no-buil
1818
install-fftwmpi = "pip install -e plugins/fluidfft-fftwmpi --no-build-isolation -v"
1919

2020
[dependencies]
21-
python = ">=3.10"
21+
python = ">=3.11"
2222
numpy = ">=1.26.3"
2323
transonic = ">=0.6.4"
2424
fluiddyn = ">=0.5.2"

pylock.toml

Lines changed: 3962 additions & 0 deletions
Large diffs are not rendered by default.

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ authors = [
1313
dependencies = [
1414
"fluiddyn >= 0.2.3",
1515
"transonic >= 0.6.4",
16-
"importlib_metadata; python_version < '3.10'",
1716
]
18-
requires-python = ">= 3.10"
17+
requires-python = ">= 3.11"
1918
readme = "README.md"
20-
license = {text = "CeCILL License"}
19+
license = "CeCILL-1.0"
20+
license-files = ["LICENSE.txt"]
2121
keywords = [
2222
"Fast Fourier Transform",
2323
"FFT",
@@ -27,7 +27,6 @@ classifiers = [
2727
"Development Status :: 5 - Production/Stable",
2828
"Intended Audience :: Education",
2929
"Intended Audience :: Science/Research",
30-
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
3130
"Programming Language :: C",
3231
"Programming Language :: Cython",
3332
"Programming Language :: Python",
@@ -36,6 +35,7 @@ classifiers = [
3635
"Programming Language :: Python :: 3.11",
3736
"Programming Language :: Python :: 3.12",
3837
"Programming Language :: Python :: 3.13",
38+
"Programming Language :: Python :: 3.14",
3939
"Topic :: Scientific/Engineering",
4040
]
4141

0 commit comments

Comments
 (0)