drop python 3.6

rapidfuzz · Sep 26, 2023 · 0de194f · 0de194f
1 parent a7bf449
commit 0de194f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 30 deletions.
diff --git a/.github/workflows/pythonbuild.yml b/.github/workflows/pythonbuild.yml
@@ -12,10 +12,10 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: 'true'
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
 
       - name: Install dependencies
         run: |
@@ -44,7 +44,7 @@ jobs:
         run: |
           tools/seg_wrapper.sh pytest tests
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: dist/*.tar.gz
 
@@ -55,8 +55,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [auto32, auto64]
-        python_tag: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
+        arch: [auto32, auto64, ARM64]
+        python_tag: ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
         exclude:
           # PyPy only supports x86_64 on Windows
           - arch: auto32
@@ -66,6 +66,18 @@ jobs:
           - arch: auto32
             python_tag: "pp39-*"
 
+          # ARM64 only supported only supported on cpython >= 3.9
+          - arch: ARM64
+            python_tag: "pp37-*"
+          - arch: ARM64
+            python_tag: "pp38-*"
+          - arch: ARM64
+            python_tag: "pp39-*"
+          - arch: ARM64
+            python_tag: "cp37-*"
+          - arch: ARM64
+            python_tag: "cp38-*"
+
     env:
       CIBW_BUILD: ${{matrix.python_tag}}
       CIBW_ARCHS: ${{matrix.arch}}
@@ -74,24 +86,24 @@ jobs:
       CIBW_BUILD_VERBOSITY: 3
 
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: artifact
           path: dist
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
 
       - name: Copy wheel
         run: cp dist/*.tar.gz rapidfuzz.tar.gz
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.1
+        uses: pypa/cibuildwheel@v2.16.1
         with:
           package-dir: rapidfuzz.tar.gz
           output-dir: wheelhouse
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
 
@@ -103,15 +115,11 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x86_64, arm64, universal2]
-        python_tag: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
+        python_tag: ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
         exclude:
           # MacOS Arm only supported since Python 3.8
-          - arch: arm64
-            python_tag: "cp36-*"
           - arch: arm64
             python_tag: "cp37-*"
-          - arch: universal2
-            python_tag: "cp36-*"
           - arch: universal2
             python_tag: "cp37-*"
 
@@ -137,24 +145,24 @@ jobs:
       CIBW_BUILD_VERBOSITY: 3
 
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: artifact
           path: dist
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
 
       - name: Copy wheel
         run: cp dist/*.tar.gz rapidfuzz.tar.gz
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.1
+        uses: pypa/cibuildwheel@v2.16.1
         with:
           package-dir: rapidfuzz.tar.gz
           output-dir: wheelhouse
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
 
@@ -166,7 +174,7 @@ jobs:
       fail-fast: false
       matrix:
         arch: [auto, aarch64, ppc64le, s390x]
-        python_tag: [ "cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
+        python_tag: ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
         exclude:
           # PyPy builds not supported on ppc64le / s390x
           - arch: ppc64le
@@ -190,27 +198,27 @@ jobs:
       CIBW_BUILD_VERBOSITY: 3
 
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: artifact
           path: dist
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
 
-      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-qemu-action@v2
         name: Set up QEMU
 
       - name: Copy wheel
         run: cp dist/*.tar.gz rapidfuzz.tar.gz
 
       - name: Build wheel
-        uses: pypa/cibuildwheel@v2.13.1
+        uses: pypa/cibuildwheel@v2.16.1
         with:
           package-dir: rapidfuzz.tar.gz
           output-dir: wheelhouse
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
 
@@ -221,12 +229,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: artifact
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@release/v1
+      - uses: pypa/gh-action-pypi-publish@v1.8.1
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,7 +2,11 @@
 
 ### v0.22.0
 #### Changed
-- Added support for Python 3.12
+- add support for Python 3.12
+- drop support for Python 3.6
+
+#### Added
+- add wheels for windows arm64
 
 ### v0.21.1
 #### Changed

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ computation of:
 * string sequence and set similarity
 
 ## Requirements
-* Python 3.6 or later
+* Python 3.7 or later
 
 ## Installation
 ```bash

diff --git a/setup.py b/setup.py
@@ -18,7 +18,6 @@
     license_file = "COPYING",
     classifiers=[
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
@@ -33,5 +32,5 @@
     package_data={
         "Levenshtein": ["*.pyi", "py.typed"]
     },
-    python_requires=">=3.6"
+    python_requires=">=3.7"
 )