Skip to content

Commit 6c3816a

Browse files
authored
Merge pull request silx-kit#345 from t20100/update-min-python
Updated minimum required version of Python
2 parents 20c95e7 + a646486 commit 6c3816a

File tree

5 files changed

+39
-44
lines changed

5 files changed

+39
-44
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Build sdist & documentation
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: actions/setup-python@v5
1717
with:
1818
python-version: '3.12'
@@ -35,28 +35,24 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
include:
38-
- os: ubuntu-20.04
39-
cibw_build: "cp38-manylinux_x86_64"
40-
- os: windows-2019
41-
cibw_build: "cp38-win_amd64"
42-
- os: macos-13
43-
cibw_build: "cp38-macosx_x86_64"
44-
- os: ubuntu-latest
45-
cibw_build: "cp310-manylinux_x86_64"
4638
- os: windows-latest
47-
cibw_build: "cp311-win_amd64"
39+
cibw_build: "cp39-win_amd64"
40+
- os: ubuntu-latest
41+
cibw_build: "cp312-manylinux_x86_64"
4842
- os: macos-latest
49-
cibw_build: "cp312-macosx_arm64"
43+
cibw_build: "cp313-macosx_arm64"
5044

5145
steps:
52-
- uses: actions/checkout@v4
53-
- uses: pypa/cibuildwheel@v2.23.0
46+
- uses: actions/checkout@v5
47+
- uses: pypa/cibuildwheel@v3.1.4
5448
env:
5549
MACOSX_DEPLOYMENT_TARGET: "10.13"
5650
CIBW_BUILD_VERBOSITY: 1
5751
CIBW_BUILD: ${{ matrix.cibw_build }}
5852
CIBW_TEST_EXTRAS: "test"
59-
# Test twice: with latest version and with numpy v1 and oldest supported h5py
53+
# Test twice:
54+
# - with latest version
55+
# - with numpy v1 (for Python<=3.12) and oldest supported h5py
6056
CIBW_TEST_COMMAND: >
6157
python {project}/test/test.py &&
6258
pip install -r {project}/ci/oldest_h5py.txt &&

.github/workflows/release.yml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Build and test source distribution
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- uses: actions/setup-python@v5
1616
with:
1717
python-version: '3.12'
@@ -31,7 +31,7 @@ jobs:
3131
name: Build documentation
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- uses: actions/setup-python@v5
3636
with:
3737
python-version: "3.12"
@@ -58,29 +58,29 @@ jobs:
5858
fail-fast: false
5959
matrix:
6060
include:
61-
- os: ubuntu-20.04
61+
- os: ubuntu-24.04
6262
cibw_archs: "auto64"
6363
with_sse2: true
64-
- os: ubuntu-20.04
64+
- os: ubuntu-24.04-arm
6565
cibw_archs: "aarch64"
6666
with_sse2: false
67-
- os: ubuntu-20.04
67+
- os: ubuntu-24.04
6868
cibw_archs: "ppc64le"
6969
with_sse2: false
70-
- os: windows-2019
70+
- os: windows-2022
7171
cibw_archs: "auto64"
7272
with_sse2: true
7373
- os: macos-13
7474
cibw_archs: "universal2"
7575
with_sse2: true
7676

7777
steps:
78-
- uses: actions/checkout@v4
78+
- uses: actions/checkout@v5
7979
- uses: docker/setup-qemu-action@v3
80-
if: runner.os == 'Linux'
80+
if: runner.os == 'Linux' && runner.arch == 'X64'
8181
with:
8282
platforms: all
83-
- uses: pypa/cibuildwheel@v2.23.0
83+
- uses: pypa/cibuildwheel@v3.1.4
8484
env:
8585
# Configure hdf5plugin build
8686
HDF5PLUGIN_OPENMP: "False"
@@ -98,16 +98,14 @@ jobs:
9898
CIBW_ENVIRONMENT_PASS_LINUX: HDF5PLUGIN_OPENMP HDF5PLUGIN_NATIVE HDF5PLUGIN_SSE2 HDF5PLUGIN_SSSE3 HDF5PLUGIN_AVX2 HDF5PLUGIN_AVX512 HDF5PLUGIN_BMI2 HDF5PLUGIN_CPP11 HDF5PLUGIN_CPP14 HDF5PLUGIN_CPP20
9999

100100
CIBW_BUILD_VERBOSITY: 1
101-
# Use Python3.11 to build wheels that are compatible with all supported version of Python
102-
CIBW_BUILD: cp311-*
103-
# Do not build for pypy and muslinux
104-
CIBW_SKIP: pp* *-musllinux_*
101+
# Use Python3.12 to build wheels that are compatible with all supported version of Python
102+
CIBW_BUILD: cp312-*
103+
# Do not build for muslinux
104+
CIBW_SKIP: "*-musllinux_*"
105105
CIBW_ARCHS: ${{ matrix.cibw_archs }}
106106

107107
# Use silx wheelhouse for ppc64le
108-
# Use numpy<2 since a wheel for h5py v3.11 which supports numpy v2 is not available for aarch64
109-
# see https://github.com/h5py/h5py/issues/2408
110-
CIBW_BEFORE_TEST: pip install "numpy<2" h5py --only-binary ":all:" --find-links=https://www.silx.org/pub/wheelhouse/ --trusted-host=www.silx.org
108+
CIBW_BEFORE_TEST: pip install h5py --only-binary ":all:" --find-links=https://www.silx.org/pub/wheelhouse/ --trusted-host=www.silx.org
111109
CIBW_TEST_COMMAND: python {project}/test/test.py
112110
- uses: actions/upload-artifact@v4
113111
with:
@@ -121,23 +119,23 @@ jobs:
121119
strategy:
122120
matrix:
123121
os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
124-
python-version: ['3.8', '3.12']
122+
python-version: ['3.9', '3.13']
125123
include:
126-
- python-version: '3.8'
124+
- python-version: '3.9'
127125
OLDEST_DEPENDENCIES: 'h5py==3.0.0 "numpy<2"'
128-
- python-version: '3.8'
126+
- python-version: '3.9'
129127
os: 'macos-latest'
130128
OLDEST_DEPENDENCIES: 'h5py==3.7.0 "numpy<2"'
131-
- python-version: '3.12'
132-
OLDEST_DEPENDENCIES: 'h5py==3.10.0 "numpy<2"'
129+
- python-version: '3.13'
130+
OLDEST_DEPENDENCIES: 'h5py==3.12.1 numpy==2.1.0'
133131

134132
steps:
135-
- uses: actions/checkout@v4
133+
- uses: actions/checkout@v5
136134
- uses: actions/setup-python@v5
137135
with:
138136
python-version: ${{ matrix.python-version }}
139137
cache: 'pip'
140-
- uses: actions/download-artifact@v4
138+
- uses: actions/download-artifact@v5
141139
with:
142140
pattern: cibw-wheels-*
143141
path: dist
@@ -166,7 +164,7 @@ jobs:
166164
# or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
167165
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
168166
steps:
169-
- uses: actions/download-artifact@v4
167+
- uses: actions/download-artifact@v5
170168
with:
171169
pattern: cibw-*
172170
path: dist

ci/oldest_h5py.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
numpy < 2
1+
numpy < 2 ; python_version <= '3.12'
22
h5py == 3.10.0 ; python_version == '3.12'
33
h5py == 3.8.0 ; python_version == '3.11'
44
h5py == 3.6.0 ; python_version == '3.10'
5-
h5py == 3.0.0 ; python_version <= '3.9'
5+
h5py == 3.0.0 ; python_version == '3.9'

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ authors = [
99
]
1010
description = "HDF5 Plugins for Windows, MacOS, and Linux"
1111
readme = "README.rst"
12-
requires-python = ">=3.8"
12+
requires-python = ">=3.9"
1313
license = {file = "LICENSE"}
1414
classifiers = [
1515
"Development Status :: 5 - Production/Stable",
@@ -44,8 +44,9 @@ doc = [
4444
"sphinx_rtd_theme",
4545
]
4646
test = [
47-
"blosc2>=2.5.1;python_version>='3.9'",
48-
"blosc2-grok>=0.2.2;python_version>='3.9'",
47+
"numpy<2 ; python_version == '3.9'",
48+
"blosc2>=2.5.1",
49+
"blosc2-grok>=0.2.2",
4950
]
5051

5152
[tool.setuptools]

src/hdf5plugin/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from typing import NamedTuple
2727
import re
2828

29-
version = "5.1.0"
29+
version = "6.0.0"
3030

3131

3232
class _VersionInfo(NamedTuple):

0 commit comments

Comments
 (0)