Skip to content

Commit 0de194f

Browse files
maxbachmannmaxbachmann
authored
drop python 3.6
1 parent a7bf449 commit 0de194f

File tree

4 files changed

+41
-30
lines changed

4 files changed

+41
-30
lines changed

‎.github/workflows/pythonbuild.yml‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
name: Build source distribution
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
with:
1717
submodules: 'true'
18-
- uses: actions/setup-python@v2
18+
- uses: actions/setup-python@v4
1919

2020
- name: Install dependencies
2121
run: |
@@ -44,7 +44,7 @@ jobs:
4444
run: |
4545
tools/seg_wrapper.sh pytest tests
4646
47-
- uses: actions/upload-artifact@v2
47+
- uses: actions/upload-artifact@v3
4848
with:
4949
path: dist/*.tar.gz
5050

@@ -55,8 +55,8 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
arch: [auto32, auto64]
59-
python_tag: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
58+
arch: [auto32, auto64, ARM64]
59+
python_tag: ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
6060
exclude:
6161
# PyPy only supports x86_64 on Windows
6262
- arch: auto32
@@ -66,6 +66,18 @@ jobs:
6666
- arch: auto32
6767
python_tag: "pp39-*"
6868

69+
# ARM64 only supported only supported on cpython >= 3.9
70+
- arch: ARM64
71+
python_tag: "pp37-*"
72+
- arch: ARM64
73+
python_tag: "pp38-*"
74+
- arch: ARM64
75+
python_tag: "pp39-*"
76+
- arch: ARM64
77+
python_tag: "cp37-*"
78+
- arch: ARM64
79+
python_tag: "cp38-*"
80+
6981
env:
7082
CIBW_BUILD: ${{matrix.python_tag}}
7183
CIBW_ARCHS: ${{matrix.arch}}
@@ -74,24 +86,24 @@ jobs:
7486
CIBW_BUILD_VERBOSITY: 3
7587

7688
steps:
77-
- uses: actions/download-artifact@v2
89+
- uses: actions/download-artifact@v3
7890
with:
7991
name: artifact
8092
path: dist
8193

82-
- uses: actions/setup-python@v2
94+
- uses: actions/setup-python@v4
8395

8496
- name: Copy wheel
8597
run: cp dist/*.tar.gz rapidfuzz.tar.gz
8698

8799
- name: Build wheels
88-
uses: pypa/cibuildwheel@v2.13.1
100+
uses: pypa/cibuildwheel@v2.16.1
89101
with:
90102
package-dir: rapidfuzz.tar.gz
91103
output-dir: wheelhouse
92104

93105
- name: Upload wheels
94-
uses: actions/upload-artifact@v2
106+
uses: actions/upload-artifact@v3
95107
with:
96108
path: ./wheelhouse/*.whl
97109

@@ -103,15 +115,11 @@ jobs:
103115
fail-fast: false
104116
matrix:
105117
arch: [x86_64, arm64, universal2]
106-
python_tag: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
118+
python_tag: ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
107119
exclude:
108120
# MacOS Arm only supported since Python 3.8
109-
- arch: arm64
110-
python_tag: "cp36-*"
111121
- arch: arm64
112122
python_tag: "cp37-*"
113-
- arch: universal2
114-
python_tag: "cp36-*"
115123
- arch: universal2
116124
python_tag: "cp37-*"
117125

@@ -137,24 +145,24 @@ jobs:
137145
CIBW_BUILD_VERBOSITY: 3
138146

139147
steps:
140-
- uses: actions/download-artifact@v2
148+
- uses: actions/download-artifact@v3
141149
with:
142150
name: artifact
143151
path: dist
144152

145-
- uses: actions/setup-python@v2
153+
- uses: actions/setup-python@v4
146154

147155
- name: Copy wheel
148156
run: cp dist/*.tar.gz rapidfuzz.tar.gz
149157

150158
- name: Build wheels
151-
uses: pypa/cibuildwheel@v2.13.1
159+
uses: pypa/cibuildwheel@v2.16.1
152160
with:
153161
package-dir: rapidfuzz.tar.gz
154162
output-dir: wheelhouse
155163

156164
- name: Upload wheels
157-
uses: actions/upload-artifact@v2
165+
uses: actions/upload-artifact@v3
158166
with:
159167
path: ./wheelhouse/*.whl
160168

@@ -166,7 +174,7 @@ jobs:
166174
fail-fast: false
167175
matrix:
168176
arch: [auto, aarch64, ppc64le, s390x]
169-
python_tag: [ "cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
177+
python_tag: ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp37-*", "pp38-*", "pp39-*"]
170178
exclude:
171179
# PyPy builds not supported on ppc64le / s390x
172180
- arch: ppc64le
@@ -190,27 +198,27 @@ jobs:
190198
CIBW_BUILD_VERBOSITY: 3
191199

192200
steps:
193-
- uses: actions/download-artifact@v2
201+
- uses: actions/download-artifact@v3
194202
with:
195203
name: artifact
196204
path: dist
197205

198-
- uses: actions/setup-python@v2
206+
- uses: actions/setup-python@v4
199207

200-
- uses: docker/setup-qemu-action@v1
208+
- uses: docker/setup-qemu-action@v2
201209
name: Set up QEMU
202210

203211
- name: Copy wheel
204212
run: cp dist/*.tar.gz rapidfuzz.tar.gz
205213

206214
- name: Build wheel
207-
uses: pypa/cibuildwheel@v2.13.1
215+
uses: pypa/cibuildwheel@v2.16.1
208216
with:
209217
package-dir: rapidfuzz.tar.gz
210218
output-dir: wheelhouse
211219

212220
- name: Upload wheels
213-
uses: actions/upload-artifact@v2
221+
uses: actions/upload-artifact@v3
214222
with:
215223
path: ./wheelhouse/*.whl
216224

@@ -221,12 +229,12 @@ jobs:
221229
runs-on: ubuntu-latest
222230

223231
steps:
224-
- uses: actions/download-artifact@v2
232+
- uses: actions/download-artifact@v3
225233
with:
226234
name: artifact
227235
path: dist
228236

229-
- uses: pypa/gh-action-pypi-publish@release/v1
237+
- uses: pypa/gh-action-pypi-publish@v1.8.1
230238
with:
231239
user: __token__
232240
password: ${{ secrets.pypi_password }}

‎HISTORY.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
### v0.22.0
44
#### Changed
5-
- Added support for Python 3.12
5+
- add support for Python 3.12
6+
- drop support for Python 3.6
7+
8+
#### Added
9+
- add wheels for windows arm64
610

711
### v0.21.1
812
#### Changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ computation of:
3333
* string sequence and set similarity
3434

3535
## Requirements
36-
* Python 3.6 or later
36+
* Python 3.7 or later
3737

3838
## Installation
3939
```bash

‎setup.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
license_file = "COPYING",
1919
classifiers=[
2020
"Programming Language :: Python :: 3",
21-
"Programming Language :: Python :: 3.6",
2221
"Programming Language :: Python :: 3.7",
2322
"Programming Language :: Python :: 3.8",
2423
"Programming Language :: Python :: 3.9",
@@ -33,5 +32,5 @@
3332
package_data={
3433
"Levenshtein": ["*.pyi", "py.typed"]
3534
},
36-
python_requires=">=3.6"
35+
python_requires=">=3.7"
3736
)

0 commit comments

Comments
 (0)