Skip to content

Commit

Permalink
Merge pull request #725 from googlefonts/drop-py36
Browse files Browse the repository at this point in the history
drop Python 3.6, require >= 3.7
  • Loading branch information
anthrotype authored Sep 28, 2021
2 parents 29771a5 + e43cd53 commit 7655ff9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
strategy:
matrix:
python-version: [3.9, 3.6]
python-version: [3.9, 3.7]
platform: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 1 addition & 5 deletions Lib/glyphsLib/glyphdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,7 @@ def get_glyph(glyph_name, data=None):
if data is None:
global GLYPHDATA
if GLYPHDATA is None:
try:
from importlib.resources import open_binary
except ImportError:
# use backport for python < 3.7
from importlib_resources import open_binary
from importlib.resources import open_binary

GLYPHDATA = GlyphData.from_files(
open_binary("glyphsLib.data", "GlyphData.xml"),
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
glyphsLib
=========

This Python 3.6+ library provides a bridge from Glyphs source files (.glyphs) to
This Python 3.7+ library provides a bridge from Glyphs source files (.glyphs) to
UFOs and Designspace files via `defcon <https://github.com/typesupply/defcon/>`__ and `designspaceLib <https://github.com/fonttools/fonttools>`__.

The main methods for conversion are found in ``__init__.py``.
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@ classifiers =
package_dir = =Lib
packages = find:
include_package_data = True
python_requires = >=3.6
python_requires = >=3.7
setup_requires =
setuptools_scm
install_requires =
ufoLib2 >= 0.6.2
fonttools[ufo,unicode] >= 4.27.1
importlib_resources; python_version < '3.7'
openstep-plist >= 0.2.2

[options.extras_require]
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = lint, py36, py37, py38, py39, htmlcov
envlist = lint, py37, py38, py39, htmlcov
; if any of the requested python interpreters is unavailable (e.g. on the local dev
; workstation), the tests are skipped and tox won't return an error
skip_missing_interpreters = true
Expand Down

0 comments on commit 7655ff9

Please sign in to comment.