Skip to content

Commit eadd2d2

Browse files
build: get tests and wheels working again on linux, restrict testing/building to linux (#321)
* ci(pre-commit): pre-commit autoupdate updates: - [github.com/psf/black-pre-commit-mirror: 24.8.0 → 25.1.0](psf/black-pre-commit-mirror@24.8.0...25.1.0) - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](pre-commit/pre-commit-hooks@v4.6.0...v5.0.0) - [github.com/PyCQA/isort: 5.13.2 → 6.0.1](PyCQA/isort@5.13.2...6.0.1) - [github.com/asottile/pyupgrade: v3.17.0 → v3.19.1](asottile/pyupgrade@v3.17.0...v3.19.1) - [github.com/asottile/setup-cfg-fmt: v2.5.0 → v2.7.0](asottile/setup-cfg-fmt@v2.5.0...v2.7.0) - [github.com/pycqa/flake8: 7.1.1 → 7.1.2](PyCQA/flake8@7.1.1...7.1.2) - [github.com/mgedmin/check-manifest: 0.49 → 0.50](mgedmin/check-manifest@0.49...0.50) - [github.com/pre-commit/mirrors-clang-format: v18.1.8 → v19.1.7](pre-commit/mirrors-clang-format@v18.1.8...v19.1.7) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * py39 plus for pyupgrade * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * bump python to 3.9/3.13 * wheels to 3.9-3.13 * update boost url * 1_87_0 everywhere * move cirrus to 3.9/3.13 * drop macos wheels for now * drop macos from wheels * bump cibw for wheels * change classifiers to specify we only work in linux --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Lindsey Gray <[email protected]>
1 parent 4cdb0b8 commit eadd2d2

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ task:
1111
cpu: 4
1212
memory: 6G
1313
matrix:
14-
- image: python:3.8
15-
- image: python:3.12
14+
- image: python:3.9
15+
- image: python:3.13
1616

1717
install_build_dependencies_script: |
1818
apt-get update

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
strategy:
3434
fail-fast: false
3535
matrix:
36-
python-version: ["3.8", "3.12"]
37-
runs-on: [ubuntu-latest, macos-13]
36+
python-version: ["3.9", "3.13"]
37+
runs-on: [ubuntu-latest] #, macos-latest]
3838
arch: [auto64]
3939
steps:
4040
- uses: actions/checkout@v4
@@ -72,8 +72,8 @@ jobs:
7272
strategy:
7373
fail-fast: false
7474
matrix:
75-
os: [ubuntu-latest, macos-13]
76-
python: [312]
75+
os: [ubuntu-latest] #, macos-latest]
76+
python: [313]
7777
arch: [auto64]
7878

7979
steps:
@@ -115,7 +115,7 @@ jobs:
115115
make --jobs
116116
make install
117117
118-
- uses: pypa/cibuildwheel@v2.22
118+
- uses: pypa/cibuildwheel@v2.23
119119
env:
120120
CIBW_ARCHS: ${{ matrix.arch }}
121121
CIBW_BUILD: cp${{ matrix.python }}-*

.github/workflows/wheels.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,10 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python: [38, 39, 310, 311, 312]
33-
os: [ubuntu-latest, macos-13]
32+
python: [39, 310, 311, 312, 313]
33+
os: [ubuntu-latest] #, macos-latest]
3434
arch: [auto64]
3535
include:
36-
- python: 38
37-
os: ubuntu-latest
38-
arch: aarch64
3936
- python: 39
4037
os: ubuntu-latest
4138
arch: aarch64
@@ -48,6 +45,9 @@ jobs:
4845
- python: 312
4946
os: ubuntu-latest
5047
arch: aarch64
48+
- python: 313
49+
os: ubuntu-latest
50+
arch: aarch64
5151

5252
steps:
5353
- uses: docker/setup-qemu-action@v3
@@ -88,7 +88,7 @@ jobs:
8888
make --jobs
8989
make install
9090
91-
- uses: pypa/cibuildwheel@v2.22
91+
- uses: pypa/cibuildwheel@v2.23
9292
env:
9393
CIBW_ARCHS: ${{ matrix.arch }}
9494
CIBW_BUILD: cp${{ matrix.python }}-*

.pre-commit-config.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ ci:
77

88
repos:
99
- repo: https://github.com/psf/black-pre-commit-mirror
10-
rev: 24.8.0
10+
rev: 25.1.0
1111
hooks:
1212
- id: black
1313

1414
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: v4.6.0
15+
rev: v5.0.0
1616
hooks:
1717
- id: check-added-large-files
1818
- id: check-case-conflict
@@ -26,36 +26,36 @@ repos:
2626
- id: trailing-whitespace
2727

2828
- repo: https://github.com/PyCQA/isort
29-
rev: 5.13.2
29+
rev: 6.0.1
3030
hooks:
3131
- id: isort
3232

3333
- repo: https://github.com/asottile/pyupgrade
34-
rev: v3.17.0
34+
rev: v3.19.1
3535
hooks:
3636
- id: pyupgrade
37-
args: ["--py36-plus"]
37+
args: ["--py39-plus"]
3838

3939
- repo: https://github.com/asottile/setup-cfg-fmt
40-
rev: v2.5.0
40+
rev: v2.7.0
4141
hooks:
4242
- id: setup-cfg-fmt
4343

4444
- repo: https://github.com/pycqa/flake8
45-
rev: 7.1.1
45+
rev: 7.1.2
4646
hooks:
4747
- id: flake8
4848
exclude: docs/conf.py
4949
additional_dependencies: [flake8-bugbear, flake8-print]
5050

5151
- repo: https://github.com/mgedmin/check-manifest
52-
rev: "0.49"
52+
rev: "0.50"
5353
hooks:
5454
- id: check-manifest
5555
stages: [manual]
5656

5757
- repo: https://github.com/pre-commit/mirrors-clang-format
58-
rev: "v18.1.8"
58+
rev: "v19.1.7"
5959
hooks:
6060
- id: clang-format
6161
types_or: [c++, c, cuda]

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
# Add any paths that contain custom static files (such as style sheets) here,
5959
# relative to this directory. They are copied after the builtin static files,
6060
# so a file named "default.css" will overwrite the builtin "default.css".
61-
html_static_path: List[str] = []
61+
html_static_path: list[str] = []
6262

6363
master_doc = "index"

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ manylinux-i686-image = "manylinux2014"
1717
before-all = [
1818
"yum update -y",
1919
"yum install -y mpfr-devel",
20-
"curl -L https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.bz2 -o boost_1_84_0.tar.bz2",
21-
"tar --bzip2 -xf boost_1_84_0.tar.bz2",
22-
"mv boost_1_84_0/boost /usr/include/boost",
20+
"curl -L https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2 -o boost_1_87_0.tar.bz2",
21+
"tar --bzip2 -xf boost_1_87_0.tar.bz2",
22+
"mv boost_1_87_0/boost /usr/include/boost",
2323
]
2424
# Skip musllinux builds for the moment
2525
skip = "*-musllinux_*"

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ classifiers =
1717
Intended Audience :: Developers
1818
Intended Audience :: Science/Research
1919
License :: OSI Approved :: BSD License
20-
Operating System :: OS Independent
20+
Operating System :: POSIX :: Linux
2121
Programming Language :: Python
2222
Programming Language :: Python :: 3
2323
Programming Language :: Python :: 3 :: Only
@@ -34,7 +34,7 @@ install_requires =
3434
awkward>=2
3535
numpy>=1.13.3
3636
vector
37-
python_requires = >=3.8
37+
python_requires = >=3.9
3838
include_package_data = True
3939
package_dir =
4040
=src

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def run(self):
162162
' print-pythondir""",
163163
shell=True,
164164
cwd=FASTJET / "pyinterface",
165-
universal_newlines=True,
165+
text=True,
166166
).strip()
167167
)
168168

@@ -173,7 +173,7 @@ def run(self):
173173
' print-pyexecdir""",
174174
shell=True,
175175
cwd=FASTJET / "pyinterface",
176-
universal_newlines=True,
176+
text=True,
177177
).strip()
178178
)
179179

0 commit comments

Comments
 (0)