Skip to content

Commit

Permalink
Merge pull request #705 from googlefonts/housekeeping
Browse files Browse the repository at this point in the history
Housekeeping
  • Loading branch information
madig authored Aug 16, 2021
2 parents 9ac00b0 + 4336f4e commit 9271c32
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 30 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ share/python-wheels/
.installed.cfg
*.egg
MANIFEST
glyphsLib-*

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ norecursedirs = [
"data",
]

[tool.setuptools_scm]
write_to = "Lib/glyphsLib/_version.py"

[build-system]
requires = ["setuptools>=30.3.0", "wheel", "setuptools_scm"]
requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.0"]
build-backend = "setuptools.build_meta"
10 changes: 5 additions & 5 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ colorama==0.4.4
# via pytest
coverage==5.5
# via -r requirements-dev.in
cu2qu==1.6.7
cu2qu==1.6.7.post1
# via ufo2ft
defcon==0.8.1
defcon==0.9.0
# via -r requirements-dev.in
execnet==1.9.0
# via pytest-xdist
fonttools[ufo,unicode]==4.26.1
fonttools[ufo,unicode]==4.26.2
# via
# booleanoperations
# cffsubr
Expand All @@ -33,7 +33,7 @@ fonttools[ufo,unicode]==4.26.1
# ufo2ft
fs==2.4.13
# via fonttools
importlib-metadata==4.6.3
importlib-metadata==4.6.4
# via pytest-randomly
iniconfig==1.1.1
# via pytest
Expand All @@ -59,7 +59,7 @@ pytest==6.2.4
# pytest-xdist
pytest-forked==1.3.0
# via pytest-xdist
pytest-randomly==3.8.0
pytest-randomly==3.10.1
# via -r requirements-dev.in
pytest-xdist==2.3.0
# via -r requirements-dev.in
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile setup.py
# pip-compile setup.cfg
#
appdirs==1.4.4
# via fs
attrs==21.2.0
# via ufolib2
fonttools[ufo,unicode]==4.26.1
fonttools[ufo,unicode]==4.26.2
# via
# glyphsLib (setup.py)
# glyphsLib (setup.cfg)
# ufolib2
fs==2.4.13
# via fonttools
openstep-plist==0.2.2.post1
# via glyphsLib (setup.py)
# via glyphsLib (setup.cfg)
pytz==2021.1
# via fs
six==1.16.0
# via fs
ufolib2==0.11.1
# via glyphsLib (setup.py)
# via glyphsLib (setup.cfg)
unicodedata2==13.0.0.post2
# via fonttools

Expand Down
2 changes: 0 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ python_requires = >=3.6
setup_requires =
setuptools_scm
install_requires =
# Synchronize with requirements.in until
# https://github.com/jazzband/pip-tools/issues/1047 is implemented.
ufoLib2 >= 0.6.2
fonttools[ufo,unicode] >= 4.19.0
importlib_resources; python_version < '3.7'
Expand Down
17 changes: 0 additions & 17 deletions setup.py

This file was deleted.

1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ envlist = lint, py36, 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
isolated_build = true

[testenv]
deps =
Expand Down

0 comments on commit 9271c32

Please sign in to comment.