Skip to content

Commit

Permalink
Merge branch 'topic/default/py313' into 'branch/default'
Browse files Browse the repository at this point in the history
Prepare 0.5.4 (Python 3.10 - 3.13)

See merge request fluiddyn/fluidimage!115
  • Loading branch information
paugier committed Nov 7, 2024
2 parents d483d86 + f71dcc4 commit b45dcb2
Show file tree
Hide file tree
Showing 8 changed files with 10,376 additions and 10,571 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
# 2024/11/07: 3.13 will have to be added when scikit-image 0.25 is available
python-version: ["3.10", "3.11", "3.12"]

steps:
- name: Install apt packages
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-pixi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
fail-fast: false
matrix:
os: ["windows-2022", "macos-latest"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]
defaults:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v4
- uses: prefix-dev/[email protected].0
- uses: prefix-dev/[email protected].1
with:
pixi-version: v0.22.0
pixi-version: v0.33.0
cache: false
- name: Install
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
with:
python-version: 3.x
- name: Build wheels
uses: pypa/cibuildwheel@v2.19.2
uses: pypa/cibuildwheel@v2.21.3
env:
CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
CIBW_ARCHS: ${{ matrix.architecture }}
- uses: actions/upload-artifact@v4
with:
Expand All @@ -49,9 +49,9 @@ jobs:
with:
python-version: 3.x
- name: Build wheels
uses: pypa/cibuildwheel@v2.19.2
uses: pypa/cibuildwheel@v2.21.3
env:
CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
CIBW_ARCHS: ${{ matrix.architecture }}
# increase pip debugging output
# CIBW_BUILD_VERBOSITY: 2
Expand Down Expand Up @@ -81,9 +81,9 @@ jobs:
python-version: 3.x

- name: Build wheels
uses: pypa/cibuildwheel@v2.19.2
uses: pypa/cibuildwheel@v2.21.3
env:
CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
CIBW_ARCHS: aarch64
- uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
name: sdist
- uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.13
- run: |
pip install pip -U
ls
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9
FROM python:3.10
LABEL Pierre Augier <[email protected]>

RUN apt-get update
Expand Down
3,384 changes: 1,771 additions & 1,613 deletions pdm.lock

Large diffs are not rendered by default.

17,530 changes: 8,588 additions & 8,942 deletions pixi.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ install-editable = {cmd = "pip install -e . -v --no-build-isolation --no-deps",
test = "export OMP_NUM_THREADS=1 && pytest src -v -s"

[dependencies]
python = ">=3.9"
python = ">=3.10"
numpy = ">=1.26.3"
transonic = ">=0.6.4"
fluiddyn = ">=0.6.2"
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-backend = 'mesonpy'

[project]
name = "fluidimage"
version = "0.5.3"
version = "0.5.4"
description = "Fluid image processing with Python."
authors = [
{name = "Pierre Augier", email = "[email protected]"},
Expand All @@ -31,7 +31,7 @@ dependencies = [
"rich>=13.7.1",
"textual",
]
requires-python = ">=3.9"
requires-python = ">=3.10"
readme = "README.md"
license = {text = "CeCILL"}
keywords = [
Expand All @@ -47,7 +47,7 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering",
]

Expand Down

0 comments on commit b45dcb2

Please sign in to comment.