From 70ae6961b679091ae275e51d67224d91a24e5209 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Wed, 20 Mar 2024 00:00:43 +0530 Subject: [PATCH 1/5] Support python-3.12 Signed-off-by: Ayan Sinha Mahapatra --- .github/workflows/extensive-tests.yml | 6 +++--- .github/workflows/test-and-build.yml | 16 ++++++++-------- setup.py | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/extensive-tests.yml b/.github/workflows/extensive-tests.yml index c1296d2..31970a1 100644 --- a/.github/workflows/extensive-tests.yml +++ b/.github/workflows/extensive-tests.yml @@ -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 @@ -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 }}" diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 5b7b109..41cc597 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -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,310}-*" CIBW_MANYLINUX_X86_64_IMAGE: manylinux1 - os: ubuntu-latest @@ -61,11 +61,11 @@ jobs: - 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{37,38,39,310,311,312}-*" steps: - uses: actions/checkout@v2 @@ -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 @@ -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: diff --git a/setup.py b/setup.py index 8bd6552..28d6969 100644 --- a/setup.py +++ b/setup.py @@ -125,5 +125,5 @@ def get_long_description(): extras_require={ "testing": ["pytest", "twine", "setuptools", "wheel", ], }, - python_requires=">=3.6", + python_requires=">=3.8", ) From 4a001155fd14010890ab7736a40bd847f6e3134c Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Wed, 20 Mar 2024 14:33:56 +0530 Subject: [PATCH 2/5] Update cibuildwheel version Signed-off-by: Ayan Sinha Mahapatra --- .github/workflows/test-and-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 41cc597..672bc62 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -71,7 +71,7 @@ jobs: - 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 }} From 0286eee8dedfcacbfb384838ffb447cfd6c874ff Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 21 Mar 2024 11:23:11 +0530 Subject: [PATCH 3/5] Update python-manylinux sets Signed-off-by: Ayan Sinha Mahapatra --- .github/workflows/test-and-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 672bc62..8ce55a5 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -44,7 +44,7 @@ jobs: - os: ubuntu-latest arch: auto64 type: manylinux1 - build: "cp{38,39,310}-*" + build: "cp{38,39}-*" CIBW_MANYLINUX_X86_64_IMAGE: manylinux1 - os: ubuntu-latest @@ -56,7 +56,7 @@ jobs: - os: ubuntu-latest arch: auto64 type: manylinux2014 - build: "cp311-*" + build: "cp{311,312}-*" CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - os: macos-latest @@ -65,7 +65,7 @@ jobs: - os: windows-latest arch: auto64 - build: "cp{37,38,39,310,311,312}-*" + build: "cp{38,39,310,311,312}-*" steps: - uses: actions/checkout@v2 From 7d47cbd32c18c89291ff835bc0b4a0035a462b95 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 21 Mar 2024 12:28:55 +0530 Subject: [PATCH 4/5] Bump version to 2.1.0 Signed-off-by: Ayan Sinha Mahapatra --- CHANGELOG.rst | 8 +++++++- README.rst | 2 +- setup.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7499ec0..e26ab96 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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 diff --git a/README.rst b/README.rst index f8946c8..3cb4cad 100644 --- a/README.rst +++ b/README.rst @@ -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 diff --git a/setup.py b/setup.py index 28d6969..b8d59a0 100644 --- a/setup.py +++ b/setup.py @@ -87,7 +87,7 @@ def get_long_description(): setup( name="pyahocorasick", - version="2.0.0", + version="2.1.0", ext_modules=[module], description=( From 1c6fded1243974230d7a5d772f3bf3122b872a58 Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Thu, 21 Mar 2024 08:46:51 +0100 Subject: [PATCH 5/5] Delete appveyor.yml The tests are flaky and we already tests on Windows. Signed-off-by: Philippe Ombredanne --- appveyor.yml | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index a740762..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: 1.0.{build} - -environment: - - # borrowed from https://github.com/giampaolo/psutil - matrix: - # 64 bits only - - PYTHON: "C:\\Python36-x64" - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "64" - - PYTHON: "C:\\Python37-x64" - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "64" - - PYTHON: "C:\\Python38-x64" - PYTHON_VERSION: "3.8.x" - PYTHON_ARCH: "64" - - PYTHON: "C:\\Python39-x64" - PYTHON_VERSION: "3.9.x" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - PYTHON_ARCH: "64" - - PYTHON: "C:\\Python310-x64" - PYTHON_VERSION: "3.10.x" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - PYTHON_ARCH: "64" - -install: - - cmd: "%PYTHON%\\Scripts\\pip install -e .[testing]" - -build: off - -test_script: - - cmd: "%PYTHON%\\Scripts\\pytest -vvs"