From 4b0d6b9a1facd1e1d1174ae61388638a947aab74 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 18 Aug 2022 11:41:15 -0400 Subject: [PATCH 1/8] chore: include Python 3.11 Signed-off-by: Henry Schreiner --- .github/workflows/build-test.yml | 3 +++ .github/workflows/tests.yml | 6 +++++- .github/workflows/wheels.yml | 4 ++-- .pre-commit-config.yaml | 1 + noxfile.py | 2 +- pybind11 | 2 +- setup.cfg | 6 ++++++ 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 8b10d892c9..4efc8bbe75 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,6 +31,7 @@ jobs: strategy: matrix: python-version: + - '3.11-dev' - '3.10' - '3.9' - '3.8' @@ -85,6 +86,7 @@ jobs: strategy: matrix: python-version: + - '3.11-dev' - '3.10' - '3.9' - '3.8' @@ -141,6 +143,7 @@ jobs: strategy: matrix: python-version: + - '3.11-dev' - '3.10' - '3.9' - '3.8' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e02468287a..dbf688a164 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -58,12 +58,16 @@ 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 + env: + CIBW_BUILD: cp311-manylinux_x86_64 + - name: Upload wheels uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2d76cc68f0..5bccfdef99 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -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 }} @@ -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: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df15df8a38..bcc685d1fb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,6 +19,7 @@ repos: rev: v2.0.0 hooks: - id: setup-cfg-fmt + args: [--include-version-classifiers, --max-py-version=3.11] - repo: https://github.com/asottile/pyupgrade rev: "v2.37.3" diff --git a/noxfile.py b/noxfile.py index 6b45c2574c..da07652bc9 100644 --- a/noxfile.py +++ b/noxfile.py @@ -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"] diff --git a/pybind11 b/pybind11 index 914c06fb25..aa304c9c7d 160000 --- a/pybind11 +++ b/pybind11 @@ -1 +1 @@ -Subproject commit 914c06fb252b6cc3727d0eedab6736e88a3fcb01 +Subproject commit aa304c9c7d725ffb9d10af08a3b34cb372307020 diff --git a/setup.cfg b/setup.cfg index 7f7f82887e..4eb0d3e1e7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 From f8209cb4234ea00758829ac63f645bac0e5a1fc4 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 20 Aug 2022 13:03:31 -0400 Subject: [PATCH 2/8] ci: avoid numba on 3.11 --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0d12a0cec4..5af32262ae 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ 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 +numba>=0.50.0;python_version<"3.11" numexpr pandas>=0.24.0 pyarrow>=7.0.0;python_version > "3.6" and sys_platform != "win32" From b1171d8cfdc3d092c0191ed0e36ec139cd1edb89 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 20 Aug 2022 22:44:26 -0400 Subject: [PATCH 3/8] ci: ignore more missing 3.11 packages Signed-off-by: Henry Schreiner --- requirements-dev.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 5af32262ae..487c175d5e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,9 +1,9 @@ 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;python_version<"3.11" +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 pandas>=0.24.0 pyarrow>=7.0.0;python_version > "3.6" and sys_platform != "win32" From 82afb7d7fa11223b5928fe406df8427b3d634a02 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 20 Aug 2022 23:01:31 -0400 Subject: [PATCH 4/8] ci: ignore more missing 3.11 pyarrow Signed-off-by: Henry Schreiner --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 487c175d5e..34de0b263b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,5 +6,5 @@ jaxlib>=0.1.57,!=0.1.68;sys_platform != "win32" and python_version > "3.6" and p numba>=0.50.0;python_version < "3.11" numexpr 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 From c7a5e6694f7a5aec6e6c67ed5800b73be90f45aa Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 20 Aug 2022 23:27:53 -0400 Subject: [PATCH 5/8] tests: ignore dep warning from lark Signed-off-by: Henry Schreiner --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index a136a2a942..39ac51b005 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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_parse' is deprecated:DeprecationWarning", # From lark & Python 3.11 ] log_cli_level = "info" From a791612a2737c36124fed8ab375ccef493b1cd6b Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 22 Aug 2022 14:18:10 -0400 Subject: [PATCH 6/8] ci: filter a few more things Signed-off-by: Henry Schreiner --- pyproject.toml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 39ac51b005..2446f7893a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,7 +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_parse' is deprecated:DeprecationWarning", # From lark & Python 3.11 + "ignore:module 'sre_.*' is deprecated:DeprecationWarning", # From lark & Python 3.11 ] log_cli_level = "info" diff --git a/requirements-dev.txt b/requirements-dev.txt index 34de0b263b..3a9e3cc8d0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ fsspec;python_version > "3.6" and sys_platform != "win32" 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 +numexpr;python_version < "3.11" pandas>=0.24.0 pyarrow>=7.0.0;python_version > "3.6" and sys_platform != "win32" and python_version < "3.11" PyYAML From 8bc70f790c33f9df57a168b82c2747f0a26bbf69 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 22 Aug 2022 15:11:31 -0400 Subject: [PATCH 7/8] Update tests.yml --- .github/workflows/tests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dbf688a164..6823f98210 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -62,11 +62,7 @@ jobs: 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 - env: - CIBW_BUILD: cp311-manylinux_x86_64 + CIBW_BUILD: cp39-win_amd64 cp36-manylinux_x86_64 cp38-macosx_universal2 cp311-manylinux_x86_64 - name: Upload wheels uses: actions/upload-artifact@v3 From 370360006b7ff9d072f2e3eafb79692b0dce3249 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 22 Aug 2022 18:07:58 -0400 Subject: [PATCH 8/8] ci: don't build 3.11 on manylinux1 Signed-off-by: Henry Schreiner --- .github/workflows/tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6823f98210..2d71294408 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -62,7 +62,12 @@ jobs: env: CIBW_ARCHS_MACOS: universal2 CIBW_MANYLINUX_X86_64_IMAGE: manylinux1 - CIBW_BUILD: cp39-win_amd64 cp36-manylinux_x86_64 cp38-macosx_universal2 cp311-manylinux_x86_64 + 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 - name: Upload wheels uses: actions/upload-artifact@v3