Skip to content

Commit 00f1712

Browse files
committed
Merge branch 'topic/default/new-version-py3.13' into 'branch/default'
Prepare new version for Python 3.13 See merge request fluiddyn/fluidfft!70
2 parents 25f51ee + f42f10c commit 00f1712

File tree

9 files changed

+5552
-5324
lines changed

9 files changed

+5552
-5324
lines changed

.github/workflows/ci-linux.yml

+4-4
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.9, "3.10", "3.11", "3.12"]
12+
python-version: ["3.10", "3.11", "3.12", "3.13"]
1313

1414
steps:
1515

@@ -21,12 +21,12 @@ jobs:
2121
libopenblas-dev
2222
2323
- name: Checkout
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
fetch-depth: 0
2727

2828
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v4
29+
uses: actions/setup-python@v5
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232

@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Upload coverage to codecov
5555
if: ${{ success() }}
56-
uses: codecov/codecov-action@v3
56+
uses: codecov/codecov-action@v4
5757
with:
5858
token: ${{ secrets.CODECOV_TOKEN }}
5959
fail_ci_if_error: false # optional (default = false)

.github/workflows/ci-pixi.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,22 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
os: ["windows-2022", "macos-latest"]
14-
python-version: ["3.9", "3.10", "3.11", "3.12"]
1514
defaults:
1615
run:
1716
shell: bash -l {0}
1817
steps:
1918
- uses: actions/checkout@v3
2019
- uses: prefix-dev/[email protected]
2120
with:
22-
pixi-version: v0.26.1
21+
pixi-version: v0.35.0
2322
cache: false
2423
- name: Install
2524
run: |
2625
pixi run install-editable
2726
pixi run pip install plugins/fluidfft-fftw -v --no-build-isolation --no-deps
27+
pixi run python -c "import fluidfft_fftw.fft2d as m; print(m)"
28+
ls .pixi/envs/default/Lib/site-packages/fluidfft_fftw/fft2d
29+
pixi run python -c "import fluidfft_fftw.fft2d.with_fftw1d"
2830
- name: Tests
2931
run: |
3032
pixi run pytest -v -s tests

.github/workflows/wheels.yml

+7-7
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.19.2
29+
uses: pypa/cibuildwheel@v2.21.3
3030
env:
31-
CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
31+
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-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.19.2
52+
uses: pypa/cibuildwheel@v2.21.3
5353
env:
54-
CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
54+
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-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.19.2
82+
uses: pypa/cibuildwheel@v2.21.3
8383
env:
84-
CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
84+
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
8585
CIBW_ARCHS: aarch64
8686
- uses: actions/upload-artifact@v4
8787
with:
@@ -111,7 +111,7 @@ jobs:
111111
name: sdist
112112
- uses: actions/setup-python@v5
113113
with:
114-
python-version: 3.12
114+
python-version: 3.13
115115
- run: |
116116
pip install pip -U
117117
ls

CHANGES.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
See also the [unreleased changes].
44

5+
## [0.4.3] (2024-11-07)
6+
7+
- Compatibility Python 3.13
8+
59
## [0.4.2] (2024-08-22)
610

711
- Compatibility mpi4py 4.0
@@ -120,4 +124,5 @@ See also the [unreleased changes].
120124
[0.4.0]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.3.5...0.4.0
121125
[0.4.1]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.0...0.4.1
122126
[0.4.2]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.1...0.4.2
123-
[unreleased changes]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.2...branch%2Fdefault
127+
[0.4.3]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.2...0.4.3
128+
[unreleased changes]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.3...branch%2Fdefault

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.9
1+
FROM python:3.10
22
LABEL Pierre Augier <[email protected]>
33

44
RUN apt-get update

pdm.lock

+1,139-1,258
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.lock

+4,379-4,043
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

+9-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ 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.9"
21+
python = ">=3.10"
2222
numpy = ">=1.26.3"
2323
transonic = ">=0.6.4"
2424
fluiddyn = ">=0.5.2"
25-
fluidsim-core = ">=0.7.4"
2625
h5netcdf = ">=1.3.0"
2726
h5py = ">=3.10.0"
2827
xarray = ">=2023.12.0"
@@ -35,9 +34,6 @@ ipython = ">=8.20.0"
3534
coverage = ">=7.4.0"
3635
pytest-cov = ">=4.1.0"
3736
pytest-mock = ">=3.12.0"
38-
ninja = ">=1.11.1"
39-
meson = ">=1.3.1"
40-
meson-python = ">=0.15.0"
4137
cython = ">=3.0.8"
4238
fftw = ">=3.3.10"
4339
pkg-config = ">=0.29.2"
@@ -49,6 +45,14 @@ pytest-allclose = "*"
4945
importlib-metadata = "*"
5046

5147
[build-dependencies]
48+
meson = ">=1.3.1"
49+
ninja = ">=1.11.1"
5250
meson-python = ">=0.15.0"
5351
pythran = ">=0.15.0"
5452
transonic = ">=0.6.1"
53+
54+
[target.linux-64.dependencies]
55+
cxx-compiler = ">=1.0.0,<2"
56+
57+
[target.win-64.dependencies]
58+
m2w64-gcc = ">=5.3.0,<6"

pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = 'mesonpy'
55

66
[project]
77
name = "fluidfft"
8-
version = "0.4.2"
8+
version = "0.4.3"
99
description = "Efficient and easy Fast Fourier Transform (FFT) for Python."
1010
authors = [
1111
{name = "Pierre Augier", email = "[email protected]"},
@@ -15,7 +15,7 @@ dependencies = [
1515
"transonic >= 0.6.4",
1616
"importlib_metadata; python_version < '3.10'",
1717
]
18-
requires-python = ">= 3.9"
18+
requires-python = ">= 3.10"
1919
readme = "README.md"
2020
license = {text = "CeCILL License"}
2121
keywords = [
@@ -35,7 +35,7 @@ classifiers = [
3535
"Programming Language :: Python :: 3.10",
3636
"Programming Language :: Python :: 3.11",
3737
"Programming Language :: Python :: 3.12",
38-
"Programming Language :: Python :: 3.9",
38+
"Programming Language :: Python :: 3.13",
3939
"Topic :: Scientific/Engineering",
4040
]
4141

0 commit comments

Comments
 (0)