From 0ab3e9865bf30ec23137a64b2ded848dd2418f30 Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Thu, 12 Dec 2024 14:10:13 -0600 Subject: [PATCH 1/3] Add Python 3.13 --- .github/workflows/test.yml | 3 ++- .github/workflows/wheels.yml | 22 ++++++++++++++++++---- setup.py | 1 + 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bb694a2..a0fdb2d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,13 +14,14 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - cython-version: ["0.29.37", "3.0.7"] + cython-version: ["0.29.37", "3.0.11"] python-version: - "3.8" - "3.9" - "3.10" - "3.11" - "3.12" + - "3.13" - "pypy3.8" - "pypy3.9" - "pypy3.10" diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a883eb6..804e1ac 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -29,8 +29,8 @@ jobs: # # import itertools # - # pys = ['cp38', 'cp39', 'cp310', 'cp311', 'cp312'] - # pys_arm = ['cp38', 'cp39', 'cp310', 'cp311', 'cp312'] + # pys = ['cp38', 'cp39', 'cp310', 'cp311', 'cp312', 'cp313'] + # pys_arm = ['cp38', 'cp39', 'cp310', 'cp311', 'cp312', 'cp313'] # pypys = ['pp38', 'pp39', 'pp310'] # SKIP = set() # {"pp39-manylinux_aarch64", "pp38-win_amd64"} # combos = [] @@ -62,9 +62,9 @@ jobs: # combos.append(('windows', f'{py}-win_amd64', 'AMD64')) # # # Sort, filter, and print combinations - # for os, build, arch in sorted(combos, key=lambda x: (x[0], x[1].replace('310', '390').replace('311', '391').replace('312', '392'), x[2])): + # for os, build, arch in sorted(combos, key=lambda x: (x[0], x[1].replace('310', '390').replace('311', '391').replace('312', '392').replace('313', '393'), x[2])): # skip = "# " if build in SKIP else "" - # print(f' {skip}- {{"os": "{os}", "build": "{build}", "arch": "{arch}"}}') + # print(f' {skip}- {{"os": "{os}", "build": "{build}", "arch": "{arch}"}}') - {"os": "macos", "build": "cp38-macosx_arm64", "arch": "arm64"} - {"os": "macos", "build": "cp38-macosx_x86_64", "arch": "x86_64"} - {"os": "macos", "build": "cp39-macosx_arm64", "arch": "arm64"} @@ -75,6 +75,8 @@ jobs: - {"os": "macos", "build": "cp311-macosx_x86_64", "arch": "x86_64"} - {"os": "macos", "build": "cp312-macosx_arm64", "arch": "arm64"} - {"os": "macos", "build": "cp312-macosx_x86_64", "arch": "x86_64"} + - {"os": "macos", "build": "cp313-macosx_arm64", "arch": "arm64"} + - {"os": "macos", "build": "cp313-macosx_x86_64", "arch": "x86_64"} - {"os": "macos", "build": "pp38-macosx_x86_64", "arch": "x86_64"} - {"os": "macos", "build": "pp39-macosx_x86_64", "arch": "x86_64"} - {"os": "macos", "build": "pp310-macosx_x86_64", "arch": "x86_64"} @@ -128,6 +130,16 @@ jobs: - {"os": "ubuntu", "build": "cp312-musllinux_ppc64le", "arch": "ppc64le"} - {"os": "ubuntu", "build": "cp312-musllinux_s390x", "arch": "s390x"} - {"os": "ubuntu", "build": "cp312-musllinux_x86_64", "arch": "x86_64"} + - {"os": "ubuntu", "build": "cp313-manylinux_aarch64", "arch": "aarch64"} + - {"os": "ubuntu", "build": "cp313-manylinux_i686", "arch": "i686"} + - {"os": "ubuntu", "build": "cp313-manylinux_ppc64le", "arch": "ppc64le"} + - {"os": "ubuntu", "build": "cp313-manylinux_s390x", "arch": "s390x"} + - {"os": "ubuntu", "build": "cp313-manylinux_x86_64", "arch": "x86_64"} + - {"os": "ubuntu", "build": "cp313-musllinux_aarch64", "arch": "aarch64"} + - {"os": "ubuntu", "build": "cp313-musllinux_i686", "arch": "i686"} + - {"os": "ubuntu", "build": "cp313-musllinux_ppc64le", "arch": "ppc64le"} + - {"os": "ubuntu", "build": "cp313-musllinux_s390x", "arch": "s390x"} + - {"os": "ubuntu", "build": "cp313-musllinux_x86_64", "arch": "x86_64"} - {"os": "ubuntu", "build": "pp38-manylinux_aarch64", "arch": "aarch64"} - {"os": "ubuntu", "build": "pp38-manylinux_i686", "arch": "i686"} - {"os": "ubuntu", "build": "pp38-manylinux_x86_64", "arch": "x86_64"} @@ -147,6 +159,8 @@ jobs: - {"os": "windows", "build": "cp311-win_amd64", "arch": "AMD64"} - {"os": "windows", "build": "cp312-win32", "arch": "x86"} - {"os": "windows", "build": "cp312-win_amd64", "arch": "AMD64"} + - {"os": "windows", "build": "cp313-win32", "arch": "x86"} + - {"os": "windows", "build": "cp313-win_amd64", "arch": "AMD64"} - {"os": "windows", "build": "pp38-win_amd64", "arch": "AMD64"} - {"os": "windows", "build": "pp39-win_amd64", "arch": "AMD64"} - {"os": "windows", "build": "pp310-win_amd64", "arch": "AMD64"} diff --git a/setup.py b/setup.py index 251836d..b53f4f3 100644 --- a/setup.py +++ b/setup.py @@ -120,6 +120,7 @@ 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Scientific/Engineering', From 7fbc58ec235e29f1b245ce6b625dc4e7335258b0 Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Thu, 12 Dec 2024 14:18:49 -0600 Subject: [PATCH 2/3] Test wheels --- .github/workflows/test.yml | 3 +++ .github/workflows/wheels.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a0fdb2d..e823578 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,6 +25,9 @@ jobs: - "pypy3.8" - "pypy3.9" - "pypy3.10" + exclude: + - cython-version: "0.29.37" + python-version: "3.13" steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 804e1ac..a3524b4 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,7 +1,7 @@ name: Build wheels on: - # pull_request: # Uncomment to debug wheel building in a PR + pull_request: # Uncomment to debug wheel building in a PR push: branches: - master From 2a997b9138bcacef16bde94e290379c5a31965c8 Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Thu, 12 Dec 2024 14:52:45 -0600 Subject: [PATCH 3/3] Undo test wheels in PRs --- .github/workflows/wheels.yml | 2 +- cytoolz/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a3524b4..804e1ac 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,7 +1,7 @@ name: Build wheels on: - pull_request: # Uncomment to debug wheel building in a PR + # pull_request: # Uncomment to debug wheel building in a PR push: branches: - master diff --git a/cytoolz/__init__.py b/cytoolz/__init__.py index 70377e9..cb2fd05 100644 --- a/cytoolz/__init__.py +++ b/cytoolz/__init__.py @@ -24,7 +24,7 @@ functoolz._sigs.update_signature_registry() # What version of toolz does cytoolz implement? -__toolz_version__ = '0.12.1' +__toolz_version__ = '1.0.0' from ._version import get_versions