Skip to content

Commit 4a3cd27

Browse files
committed
MNT: Remove special branch for numpy 2 now that is released
1 parent 4144929 commit 4a3cd27

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.github/workflows/ci.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ jobs:
88
strategy:
99
matrix:
1010
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
11-
numpy-version: [""]
1211
architecture: [x86, x64]
1312
os:
1413
[
@@ -28,11 +27,6 @@ jobs:
2827
architecture: x86
2928
- os: macos-12
3029
architecture: x86
31-
include:
32-
- python-version: "3.12"
33-
numpy-version: ">=2.0.0rc1"
34-
architecture: x64
35-
os: ubuntu-latest
3630

3731
steps:
3832
- uses: actions/checkout@v4
@@ -49,7 +43,7 @@ jobs:
4943
5044
- name: Test with pytest
5145
run: |
52-
pip install pytest "numpy${{ matrix.numpy-version }}"
46+
pip install pytest
5347
pytest --pyargs bottleneck
5448
5549
check:
@@ -72,7 +66,7 @@ jobs:
7266
fetch-depth: 0
7367

7468
- name: Build wheels
75-
uses: pypa/cibuildwheel@v2.16.5
69+
uses: pypa/cibuildwheel@v2.21.3
7670
env:
7771
CIBW_SKIP: pp* cp36-*
7872

pyproject.toml

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ requires = [
44
"versioneer",
55
"wheel",
66
"oldest-supported-numpy ; python_version < '3.9'",
7+
# Setuptools has removed support for msvccompiler
8+
# this is needed to build old versions of bottleneck
9+
"setuptools<74 ; python_version < '3.9'",
710
# Comments on numpy build requirement range:
811
#
912
# 1. >=2.0.x is the numpy requirement for wheel builds for distribution

0 commit comments

Comments
 (0)