Skip to content

Commit 2cbd725

Browse files
authored
Merge pull request #178 from fonttools/req-py37+
Require Python 3.7+
2 parents ff27164 + 0922400 commit 2cbd725

File tree

6 files changed

+78
-43
lines changed

6 files changed

+78
-43
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ${{ matrix.platform }}
4141
strategy:
4242
matrix:
43-
python-version: ['3.6', '3.10']
43+
python-version: ['3.7', '3.10']
4444
platform: [ubuntu-latest, windows-latest]
4545

4646
steps:

requirements-dev.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
# https://github.com/jazzband/pip-tools/#workflow-for-layered-requirements
2+
-c requirements.txt
3+
14
black
25
coverage
36
flake8
4-
isort[pyproject]
7+
isort
58
mypy
69
pytest

requirements-dev.txt

Lines changed: 56 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,60 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.10
33
# To update, run:
44
#
5-
# pip-compile requirements-dev.in
5+
# pip-compile --output-file=requirements-dev.txt requirements-dev.in
66
#
7-
appdirs==1.4.4 # via black
8-
attrs==21.2.0 # via black, pytest
9-
black==21.9b0 # via -r requirements-dev.in
10-
click==8.0.3 # via black
11-
coverage==6.0.2 # via -r requirements-dev.in
12-
entrypoints==0.3 # via flake8
13-
flake8==4.0.1 # via -r requirements-dev.in
14-
isort[pyproject]==5.9.3 # via -r requirements-dev.in
15-
mccabe==0.6.1 # via flake8
16-
more-itertools==8.10.0 # via pytest
17-
mypy-extensions==0.4.3 # via mypy
18-
mypy==0.910 # via -r requirements-dev.in
19-
packaging==21.0 # via pytest
20-
pathspec==0.9.0 # via black
21-
pluggy==1.0.0 # via pytest
22-
py==1.10.0 # via pytest
23-
pycodestyle==2.8.0 # via flake8
24-
pyflakes==2.4.0 # via flake8
25-
pyparsing==2.4.7 # via packaging
26-
pytest==6.2.5 # via -r requirements-dev.in
27-
regex==2021.10.8 # via black
28-
six==1.16.0 # via packaging
29-
toml==0.10.2 # via black, isort
30-
typed-ast==1.4.3 # via black, mypy
31-
typing-extensions==3.10.0.2 # via mypy
32-
wcwidth==0.2.5 # via pytest
7+
attrs==21.2.0
8+
# via
9+
# -c requirements.txt
10+
# pytest
11+
black==21.10b0
12+
# via -r requirements-dev.in
13+
click==8.0.3
14+
# via black
15+
coverage==6.1.1
16+
# via -r requirements-dev.in
17+
flake8==4.0.1
18+
# via -r requirements-dev.in
19+
iniconfig==1.1.1
20+
# via pytest
21+
isort==5.10.1
22+
# via -r requirements-dev.in
23+
mccabe==0.6.1
24+
# via flake8
25+
mypy==0.910
26+
# via -r requirements-dev.in
27+
mypy-extensions==0.4.3
28+
# via
29+
# black
30+
# mypy
31+
packaging==21.2
32+
# via pytest
33+
pathspec==0.9.0
34+
# via black
35+
platformdirs==2.4.0
36+
# via black
37+
pluggy==1.0.0
38+
# via pytest
39+
py==1.11.0
40+
# via pytest
41+
pycodestyle==2.8.0
42+
# via flake8
43+
pyflakes==2.4.0
44+
# via flake8
45+
pyparsing==2.4.7
46+
# via packaging
47+
pytest==6.2.5
48+
# via -r requirements-dev.in
49+
regex==2021.11.2
50+
# via black
51+
toml==0.10.2
52+
# via
53+
# mypy
54+
# pytest
55+
tomli==1.2.2
56+
# via black
57+
typing-extensions==3.10.0.2
58+
# via
59+
# black
60+
# mypy

requirements.txt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.10
33
# To update, run:
44
#
5-
# pip-compile --output-file=requirements.txt setup.py
5+
# pip-compile setup.cfg
66
#
7-
appdirs==1.4.4 # via fs
8-
attrs==21.2.0 # via ufoLib2 (setup.py)
9-
fonttools[ufo]==4.27.1 # via ufoLib2 (setup.py)
10-
fs==2.4.13 # via fonttools
11-
pytz==2021.3 # via fs
12-
six==1.16.0 # via fs
7+
appdirs==1.4.4
8+
# via fs
9+
attrs==21.2.0
10+
# via ufoLib2 (setup.cfg)
11+
fonttools[ufo]==4.28.1
12+
# via ufoLib2 (setup.cfg)
13+
fs==2.4.13
14+
# via fonttools
15+
pytz==2021.3
16+
# via fs
17+
six==1.16.0
18+
# via fs
1319

1420
# The following packages are considered to be unsafe in a requirements file:
1521
# setuptools

setup.cfg

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ classifiers =
2020
[options]
2121
package_dir = =src
2222
packages = find:
23-
python_requires = >=3.6
24-
setup_requires =
25-
setuptools_scm
23+
python_requires = >=3.7
2624
install_requires =
27-
attrs >= 19.2.0
25+
attrs >= 20.1.0
2826
fonttools[ufo] >= 4.0.0
2927
typing_extensions ; python_version < "3.8"
3028

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = lint, py3{6,7,8}-cov, htmlcov
2+
envlist = lint, py3{7,8,9,10}-cov, htmlcov
33
isolated_build = true
44

55
[testenv]

0 commit comments

Comments
 (0)