Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: include Python 3.11 #1602

Merged
merged 8 commits into from
Aug 24, 2022
Merged

chore: include Python 3.11 #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b0d6b9
chore: include Python 3.11
henryiii Aug 18, 2022
f8209cb
ci: avoid numba on 3.11
henryiii Aug 20, 2022
b1171d8
ci: ignore more missing 3.11 packages
henryiii Aug 21, 2022
82afb7d
ci: ignore more missing 3.11 pyarrow
henryiii Aug 21, 2022
c7a5e66
tests: ignore dep warning from lark
henryiii Aug 21, 2022
a791612
ci: filter a few more things
henryiii Aug 22, 2022
8bc70f7
Update tests.yml
henryiii Aug 22, 2022
3703600
ci: don't build 3.11 on manylinux1
henryiii Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
strategy:
matrix:
python-version:
- '3.11-dev'
- '3.10'
- '3.9'
- '3.8'
Expand Down Expand Up @@ -85,6 +86,7 @@ jobs:
strategy:
matrix:
python-version:
- '3.11-dev'
- '3.10'
- '3.9'
- '3.8'
Expand Down Expand Up @@ -141,6 +143,7 @@ jobs:
strategy:
matrix:
python-version:
- '3.11-dev'
- '3.10'
- '3.9'
- '3.8'
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,17 @@ jobs:
with:
submodules: true

- uses: pypa/cibuildwheel@v2.8.1
- uses: pypa/cibuildwheel@v2.9.0
env:
CIBW_ARCHS_MACOS: universal2
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
CIBW_BUILD: cp39-win_amd64 cp36-manylinux_x86_64 cp38-macosx_universal2

- uses: pypa/cibuildwheel@v2.9.0
if: matrix.os == 'ubuntu-latest'
env:
CIBW_BUILD: cp311-manylinux_x86_64
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are hardcoding manylinux1 above, and manylinux1 doesn't support 3.11 (or 3.10, IIRC), so made this a separate step.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this what becomes easier when we drop Python 3.6? I'm going to open issues for dropping 3.6 in Uproot and Awkward as a reminder.


- name: Upload wheels
uses: actions/upload-artifact@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
with:
submodules: true

- uses: pypa/cibuildwheel@v2.8.1
- uses: pypa/cibuildwheel@v2.9.0
env:
CIBW_BUILD: ${{ matrix.build }}
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.CIBW_MANYLINUX_X86_64_IMAGE }}
Expand All @@ -76,7 +76,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [36, 37, 38, 39, 310]
python: [36, 37, 38, 39, 310, 311]
arch: [aarch64]
steps:

Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ repos:
rev: v2.0.0
hooks:
- id: setup-cfg-fmt
args: [--include-version-classifiers, --max-py-version=3.11]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This got missed recently, you now need --include-version-classifiers as of setup-cfg-fmt 2.


- repo: https://github.com/asottile/pyupgrade
rev: "v2.37.3"
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import nox

ALL_PYTHONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
ALL_PYTHONS = ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]

nox.options.sessions = ["lint", "tests"]

Expand Down
2 changes: 1 addition & 1 deletion pybind11
Open in desktop
Submodule pybind11 updated 152 files
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ filterwarnings = [
"ignore:the imp module is deprecated in favour of importlib:DeprecationWarning", # move to importlib to fix (setuptools issue)
"ignore:The NumPy module was reloaded:UserWarning",
"ignore:.*np\\.MachAr.*:DeprecationWarning", # until https://github.com/numba/numba/issues/7758 is fixed
"ignore:module 'sre_.*' is deprecated:DeprecationWarning", # From lark & Python 3.11
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this can also be "default", "once", or "all" if you want the warning to still show up in the tests. But they aren't really our fault so I think ignoring them is fine. But there are options.

]
log_cli_level = "info"

Expand Down
10 changes: 5 additions & 5 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
autograd
flake8
fsspec;python_version > "3.6" and sys_platform != "win32"
jax>=0.2.7;sys_platform != "win32" and python_version > "3.6"
jaxlib>=0.1.57,!=0.1.68;sys_platform != "win32" and python_version > "3.6"
numba>=0.50.0
numexpr
jax>=0.2.7;sys_platform != "win32" and python_version > "3.6" and python_version < "3.11"
jaxlib>=0.1.57,!=0.1.68;sys_platform != "win32" and python_version > "3.6" and python_version < "3.11"
numba>=0.50.0;python_version < "3.11"
numexpr;python_version < "3.11"
pandas>=0.24.0
pyarrow>=7.0.0;python_version > "3.6" and sys_platform != "win32"
pyarrow>=7.0.0;python_version > "3.6" and sys_platform != "win32" and python_version < "3.11"
PyYAML
6 changes: 6 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ classifiers =
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Scientific/Engineering
Topic :: Scientific/Engineering :: Information Analysis
Topic :: Scientific/Engineering :: Mathematics
Expand Down