Skip to content

Commit 297be9a

Browse files
authored
Merge pull request #872 from rgommers/add-cp315
CI/BLD: add Python 3.15 support
2 parents fd2d76e + afe24b9 commit 297be9a

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

.github/workflows/tests.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
MINIMUM_REQUIREMENTS: [0]
3636
USE_SDIST: [0]
3737
REFGUIDE_CHECK: [1]
38+
INSTALL_MATPLOTLIB: [1]
3839
PIP_FLAGS: [""]
3940
OPTIONS_NAME: ["default"]
4041
include:
@@ -55,8 +56,9 @@ jobs:
5556
- runs-on: ubuntu-latest
5657
python-version: "3.12"
5758
- runs-on: ubuntu-latest
58-
python-version: "3.14"
59+
python-version: "3.15-dev"
5960
USE_SDIST: 1
61+
INSTALL_MATPLOTLIB: 0
6062
OPTIONS_NAME: "install-from-sdist"
6163
- runs-on: ubuntu-latest
6264
python-version: "3.14"
@@ -79,6 +81,7 @@ jobs:
7981
PIP_FLAGS: ${{ matrix.PIP_FLAGS }}
8082
USE_SDIST: ${{ matrix.USE_SDIST }}
8183
REFGUIDE_CHECK: ${{ matrix.REFGUIDE_CHECK }}
84+
INSTALL_MATPLOTLIB: ${{ matrix.INSTALL_MATPLOTLIB }}
8285
OPTIONS_NAME: ${{ matrix.OPTIONS_NAME }}
8386
run: |
8487
uname -a
@@ -97,7 +100,10 @@ jobs:
97100
pip install ${PIP_FLAGS} cython
98101
pip install ${PIP_FLAGS} numpy
99102
fi
100-
pip install ${PIP_FLAGS} matplotlib pytest
103+
pip install ${PIP_FLAGS} pytest
104+
if [ "${INSTALL_MATPLOTLIB}" != "0" ]; then
105+
pip install ${PIP_FLAGS} matplotlib
106+
fi
101107
102108
set -o pipefail
103109
if [ "${USE_SDIST}" == "1" ]; then
@@ -148,7 +154,7 @@ jobs:
148154
strategy:
149155
fail-fast: false
150156
matrix:
151-
python-version: ["3.14t"]
157+
python-version: ["3.14t", "3.15t-dev"]
152158
steps:
153159
- uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v4.1.2
154160
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v5.5.0

.github/workflows/wheel_tests_and_release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
os: [ubuntu-latest]
37-
cibw_python: ["cp312", "cp313", "cp314", "cp314t"]
37+
cibw_python: ["cp312", "cp313", "cp314", "cp314t", "cp315", "cp315t"]
3838
cibw_arch: ["x86_64"]
3939
steps:
4040
- uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v4.1.2
@@ -65,7 +65,7 @@ jobs:
6565
fail-fast: false
6666
matrix:
6767
os: [ubuntu-22.04-arm]
68-
cibw_python: ["cp312", "cp313", "cp314", "cp314t"]
68+
cibw_python: ["cp312", "cp313", "cp314", "cp314t", "cp315", "cp315t"]
6969
cibw_arch: ["aarch64"]
7070
steps:
7171
- uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v4.1.2
@@ -95,7 +95,7 @@ jobs:
9595
fail-fast: false
9696
matrix:
9797
os: [macos-15-intel, macos-14]
98-
cibw_python: ["cp312", "cp313", "cp314", "cp314t"]
98+
cibw_python: ["cp312", "cp313", "cp314", "cp314t", "cp315", "cp315t"]
9999
cibw_arch: ["x86_64", "arm64"]
100100
exclude:
101101
- os: macos-14
@@ -144,7 +144,7 @@ jobs:
144144
matrix:
145145
os: [windows-latest, windows-11-arm]
146146
cibw_arch: ["AMD64", "x86", "ARM64"]
147-
cibw_python: ["cp312", "cp313", "cp314", "cp314t"]
147+
cibw_python: ["cp312", "cp313", "cp314", "cp314t", "cp315", "cp315t"]
148148
exclude:
149149
- os: windows-latest
150150
cibw_arch: ARM64

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ classifiers = [
4646
"Programming Language :: Python :: 3.12",
4747
"Programming Language :: Python :: 3.13",
4848
"Programming Language :: Python :: 3.14",
49+
"Programming Language :: Python :: 3.15",
4950
"Programming Language :: Python :: Free Threading :: 2 - Beta",
5051
"Topic :: Software Development :: Libraries :: Python Modules"
5152
]

pywt/_extensions/c/cwt.template.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#elif defined __GNUC__
1616
#define restrict __restrict__
1717
#endif
18-
#define _USE_MATH_DEFINES
1918
#include "math.h"
2019

2120

0 commit comments

Comments
 (0)