Skip to content

Commit 7aea49e

Browse files
authored
Merge pull request #3283 from hugovk/main
Add support for Python 3.12
2 parents 0e033b0 + 4470c44 commit 7aea49e

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

.github/workflows/test.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,22 @@ jobs:
3333
runs-on: ${{ matrix.platform }}
3434
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
3535
strategy:
36+
fail-fast: false
3637
matrix:
37-
python-version: ["3.8", "3.10"]
38-
platform: [ubuntu-latest, macos-latest, windows-latest]
39-
exclude: # Only test on the latest supported stable Python on macOS and Windows.
38+
python-version: ["3.8", "3.11", "3.12"]
39+
platform: [ubuntu-latest]
40+
include: # Only test on the latest supported stable Python on macOS and Windows.
4041
- platform: macos-latest
41-
python-version: 3.8
42+
python-version: 3.11
4243
- platform: windows-latest
43-
python-version: 3.8
44+
python-version: 3.11
4445
steps:
4546
- uses: actions/checkout@v3
4647
- name: Set up Python ${{ matrix.python-version }}
4748
uses: actions/setup-python@v4
4849
with:
4950
python-version: ${{ matrix.python-version }}
51+
allow-prereleases: true
5052
- name: Install packages
5153
run: pip install tox coverage
5254
- name: Run Tox

requirements.txt

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# we use the official Brotli module on CPython and the CFFI-based
22
# extension 'brotlipy' on PyPy
3-
brotli==1.0.9; platform_python_implementation != "PyPy"
4-
brotlicffi==1.0.9.2; platform_python_implementation == "PyPy"
3+
brotli==1.1.0; platform_python_implementation != "PyPy"
4+
brotlicffi==1.1.0.0; platform_python_implementation == "PyPy"
55
unicodedata2==15.0.0; python_version <= '3.11'
6-
scipy==1.10.0; platform_python_implementation != "PyPy"
6+
scipy==1.10.0; platform_python_implementation != "PyPy" and python_version <= '3.8'
7+
scipy==1.11.3; platform_python_implementation != "PyPy" and python_version >= '3.9'
78
munkres==1.1.4; platform_python_implementation == "PyPy"
8-
zopfli==0.2.1
9+
zopfli==0.2.3
910
fs==2.4.16
10-
skia-pathops==0.7.3; platform_python_implementation != "PyPy"
11+
skia-pathops==0.8.0.post1; platform_python_implementation != "PyPy"
1112
# this is only required to run Tests/cu2qu/{ufo,cli}_test.py
12-
ufoLib2==0.14.0
13-
ufo2ft==2.31.0
14-
pyobjc==9.0; sys_platform == "darwin"
15-
freetype-py==2.3.0
16-
uharfbuzz==0.32.0
17-
glyphsLib==6.2.1 # this is only required to run Tests/varLib/interpolatable_test.py
18-
lxml==4.9.2
13+
ufoLib2==0.16.0
14+
ufo2ft==2.33.4
15+
pyobjc==10.0; sys_platform == "darwin"
16+
freetype-py==2.4.0
17+
uharfbuzz==0.37.3
18+
glyphsLib==6.4.0 # this is only required to run Tests/varLib/interpolatable_test.py
19+
lxml==4.9.3

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ def doraise_py_compile(file, cfile=None, dfile=None, doraise=False):
165165
"Programming Language :: Python :: 3.9",
166166
"Programming Language :: Python :: 3.10",
167167
"Programming Language :: Python :: 3.11",
168+
"Programming Language :: Python :: 3.12",
168169
"Programming Language :: Python :: 3",
169170
"Topic :: Text Processing :: Fonts",
170171
"Topic :: Multimedia :: Graphics",

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
minversion = 3.0
3-
envlist = lint, py3{8,9,10,11}-cov, htmlcov
3+
envlist = lint, py3{8,9,10,11,12}-cov, htmlcov
44
skip_missing_interpreters=true
55

66
[testenv]

0 commit comments

Comments
 (0)