Skip to content

Commit

Permalink
Merge pull request #190 from AyanSinhaMahapatra/support-py-3.12
Browse files Browse the repository at this point in the history
Support building py 3.12 wheels

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
  • Loading branch information
pombredanne authored Mar 21, 2024
2 parents c98e999 + 1c6fded commit 63e9700
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 49 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/extensive-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
include:
- os: ubuntu-latest
test: make test
Expand All @@ -40,13 +40,13 @@ jobs:
test: ./runtest.sh valgrind

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup
run: sudo apt-get install -y gcovr valgrind

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "${{ matrix.python }}"

Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-10.15, windows-2019]
os: [macos-11, windows-2019]
arch: [auto64]
build: ["cp{37,38,39,310,311}-*"]
build: ["cp{38,39,310,311,312}-*"]

include:
- os: ubuntu-latest
arch: auto64
type: manylinux1
build: "cp{37,38,39}-*"
build: "cp{38,39}-*"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1

- os: ubuntu-latest
Expand All @@ -56,22 +56,22 @@ jobs:
- os: ubuntu-latest
arch: auto64
type: manylinux2014
build: "cp311-*"
build: "cp{311,312}-*"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014

- os: macos-latest
arch: universal2
build: "cp{37,38,39,310,311}-*"
build: "cp{38,39,310,311,312}-*"

- os: windows-latest
arch: auto64
build: "cp{37,38,39,310,311}-*"
build: "cp{38,39,310,311,312}-*"

steps:
- uses: actions/checkout@v2

- name: Build wheels and run tests
uses: pypa/cibuildwheel@v2.11.4
uses: pypa/cibuildwheel@v2.17.0
env:
CIBW_BUILD: ${{ matrix.build }}
CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.CIBW_MANYLINUX_I686_IMAGE }}
Expand All @@ -89,7 +89,7 @@ jobs:

build_sdist:
name: Build source distribution
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -118,8 +118,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11, windows-2019, windows-2022]
python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
build_type: ["AHOCORASICK_UNICODE", "AHOCORASICK_BYTES"]

steps:
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ Changelog
=============


2.0.0 (2022-04-xx)
2.1.0 (2022-04-xx)
--------------------------------------------------

- Drop support for Python 3.6 and 3.7
- Add support for Python 3.12

2.0.0 (2023-01-14)
--------------------------------------------------

- Drop support for Python 2
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ of time and saved (as a pickle) to disk to reload and reuse later. The library
provides an `ahocorasick` Python module that you can use as a plain dict-like
Trie or convert a Trie to an automaton for efficient Aho-Corasick search.

**pyahocorasick** is implemented in C and tested on Python 3.6 and up.
**pyahocorasick** is implemented in C and tested on Python 3.8 and up.
It works on 64 bits Linux, macOS and Windows.

The license_ is BSD-3-Clause. Some utilities, such as tests and the pure Python
Expand Down
32 changes: 0 additions & 32 deletions appveyor.yml

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def get_long_description():

setup(
name="pyahocorasick",
version="2.0.0",
version="2.1.0",
ext_modules=[module],

description=(
Expand Down Expand Up @@ -125,5 +125,5 @@ def get_long_description():
extras_require={
"testing": ["pytest", "twine", "setuptools", "wheel", ],
},
python_requires=">=3.6",
python_requires=">=3.8",
)

0 comments on commit 63e9700

Please sign in to comment.