From 1058a84cc1d49f8db0eccbb9aeb563193a58b0e9 Mon Sep 17 00:00:00 2001 From: Saransh Chopra Date: Tue, 3 Oct 2023 15:53:55 +0530 Subject: [PATCH 1/7] support Python 3.12 --- .github/workflows/ci.yml | 3 +++ docs/changelog.md | 10 +++++++++- noxfile.py | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 529933b3..a956af64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,7 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" name: Python ${{ matrix.python-version }} - Light steps: - uses: actions/checkout@v4 @@ -67,6 +68,7 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" name: Python ${{ matrix.python-version }} - Awkward v1 steps: - uses: actions/checkout@v4 @@ -98,6 +100,7 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" name: Python ${{ matrix.python-version }} - Awkward v2 steps: - uses: actions/checkout@v4 diff --git a/docs/changelog.md b/docs/changelog.md index 4650545a..e45e7e5a 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,13 @@ # Changelog +## Unreleased + +#### Maintenance + +- chore: support Python 3.12 [#388][] + +[#388]: https://github.com/scikit-hep/vector/pull/388 + ## Version 1.1 ### Version 1.1.1 @@ -114,7 +122,7 @@ - chore: minor cleanups [#266][] - chore: test on `awkward v1.10.0` and add cov to `noxfile` [#256][] - chore: use Python 3.11! [#282][] -- chore: zenodo-badge-sync-mishra1 [#269][] +- chore: zenodo badge sync [#269][] - ci: test notebooks on PRs [#272][] [#256]: https://github.com/scikit-hep/vector/pull/256 diff --git a/noxfile.py b/noxfile.py index 5a2faaeb..8cd3d09a 100644 --- a/noxfile.py +++ b/noxfile.py @@ -4,7 +4,7 @@ import nox -ALL_PYTHONS = ["3.8", "3.9", "3.10", "3.11"] +ALL_PYTHONS = ["3.8", "3.9", "3.10", "3.11", "3.12"] nox.options.sessions = ["lint", "tests", "doctests"] From a0cf3c020f5485c86db8f1f5d3d20b9ae92761a1 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 3 Oct 2023 10:18:20 -0400 Subject: [PATCH 2/7] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7dcf50ba..a3d0c64b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ awkward = [ ] dev = [ "awkward>=1.2", - "numba>=0.57", + "numba>=0.57; python_version<'3.12'", "papermill>=2.4", "pytest>=6", "pytest-cov>=3", From 771adebc8175c9522ac87bfec9c8fd7bb60e2b2a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:18:44 +0000 Subject: [PATCH 3/7] style: pre-commit fixes --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a3d0c64b..6b74f3b2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ awkward = [ ] dev = [ "awkward>=1.2", - "numba>=0.57; python_version<'3.12'", + 'numba>=0.57; python_version < "3.12"', "papermill>=2.4", "pytest>=6", "pytest-cov>=3", From 91f9f23a9cd6c22ffc5625d3f98e59fade8ec316 Mon Sep 17 00:00:00 2001 From: Saransh Chopra Date: Wed, 4 Oct 2023 18:04:05 +0530 Subject: [PATCH 4/7] Try fix branch --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a956af64..3e0c45ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,8 @@ jobs: run: python -m pip install -e .[dev] - name: Install awkward v1 - run: python -m pip install -U "awkward<2" + run: python -m pip install -U git+https://github.com/scikit-hep/awkward.git@ianna/numba-error-backport-to-v1 --no-cache --force-reinstall + - name: Test package with awkward v1.x run: python -m pytest -ra --cov=vector --xdoctest --ignore tests/test_notebooks.py . From 3068483ebf2e2afbe51cc532d25aa7a28270f947 Mon Sep 17 00:00:00 2001 From: Saransh Chopra Date: Wed, 4 Oct 2023 18:04:33 +0530 Subject: [PATCH 5/7] pre-commit --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e0c45ec..1de10b64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,6 @@ jobs: - name: Install awkward v1 run: python -m pip install -U git+https://github.com/scikit-hep/awkward.git@ianna/numba-error-backport-to-v1 --no-cache --force-reinstall - - name: Test package with awkward v1.x run: python -m pytest -ra --cov=vector --xdoctest --ignore tests/test_notebooks.py . From 0650816bcd25e476a333dae9107d66fa2612b5b8 Mon Sep 17 00:00:00 2001 From: Saransh Chopra Date: Wed, 4 Oct 2023 18:14:10 +0530 Subject: [PATCH 6/7] Upper-pin numpy in CI (temp) --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1de10b64..a1bd4f23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,9 @@ jobs: run: python -m pip install -e .[dev] - name: Install awkward v1 - run: python -m pip install -U git+https://github.com/scikit-hep/awkward.git@ianna/numba-error-backport-to-v1 --no-cache --force-reinstall + run: | + python -m pip install -U git+https://github.com/scikit-hep/awkward.git@ianna/numba-error-backport-to-v1 --no-cache --force-reinstall + python -m pip install "numpy<=1.25" - name: Test package with awkward v1.x run: python -m pytest -ra --cov=vector --xdoctest --ignore tests/test_notebooks.py . From 0206dd47a7967b16e54dc5b6b0a03c8a967ff290 Mon Sep 17 00:00:00 2001 From: Saransh Chopra Date: Thu, 5 Oct 2023 14:39:37 +0530 Subject: [PATCH 7/7] Awkward 1.10.5 --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1bd4f23..a956af64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,9 +84,7 @@ jobs: run: python -m pip install -e .[dev] - name: Install awkward v1 - run: | - python -m pip install -U git+https://github.com/scikit-hep/awkward.git@ianna/numba-error-backport-to-v1 --no-cache --force-reinstall - python -m pip install "numpy<=1.25" + run: python -m pip install -U "awkward<2" - name: Test package with awkward v1.x run: python -m pytest -ra --cov=vector --xdoctest --ignore tests/test_notebooks.py .