rsms/inter
1
1
Fork 0
mirror of https://github.com/rsms/inter.git synced 2024-09-19 06:40:16 +03:00
Code Issues Projects Releases Wiki Activity

Upgrade toolchain to Python 3, fontmake 1.8.0 and numpy 1.15.4

Browse Source
This commit is contained in:
Rasmus Andersson 2018-11-28 10:56:35 -08:00
parent 2065f9dea6
commit 2ac5b2d9ff
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
init.sh
View File

@ -58,16 +58,16 @@ else
require_virtualenv() { require_virtualenv() {
# find pip # find pip
export pip=$(which pip2) export pip=$(which pip3)
if [ "$pip" = "" ]; then if [ "$pip" = "" ]; then
export pip=$(which pip) export pip=$(which pip)
fi fi
echo "using pip: $pip $(pip --version)" echo "using pip: $pip $(pip --version)"
if [ "$pip" = "" ]; then if [ "$pip" = "" ]; then
echo "Pip for Python 2 not found (tried pip and pip2 in PATH)" >&2 echo "Pip for Python 3 not found (tried pip and pip3 in PATH)" >&2
exit 1 exit 1
elif ! ($pip --version 2>&1 | grep -q 'ython 2'); then elif ! ($pip --version 2>&1 | grep -q 'ython 3'); then
echo "Pip for Python 2 not found (found pip for different python version)" >&2 echo "Pip for Python 3 not found (found pip for different python version)" >&2
exit 1 exit 1
fi fi
# find virtualenv # find virtualenv

6
misc/fontbuild
View File

@ -364,7 +364,7 @@ class Main(object):
round_instances=True, round_instances=True,
output_path=outfilename, output_path=outfilename,
output=['variable'], output=['variable'],
subroutinize=True, optimize_cff=True,
overlaps_backend='pathops', # use Skia's pathops overlaps_backend='pathops', # use Skia's pathops
) )
@ -431,7 +431,7 @@ class Main(object):
[ ufo ], [ ufo ],
output_path=tmpfilename, output_path=tmpfilename,
output=formats, output=formats,
subroutinize=True, optimize_cff=True,
overlaps_backend='pathops', # use Skia's pathops overlaps_backend='pathops', # use Skia's pathops
) )
@ -476,7 +476,7 @@ class Main(object):
# cleanup lib # cleanup lib
lib = dict() lib = dict()
for key, value in font.lib.iteritems(): for key, value in font.lib.items():
if key.startswith('com.schriftgestaltung'): if key.startswith('com.schriftgestaltung'):
continue continue
if key == 'public.postscriptNames': if key == 'public.postscriptNames':

6
requirements.txt
View File

@ -1,9 +1,7 @@
skia-pathops==0.2.0.post2 skia-pathops==0.2.0.post2
fontmake==1.8.0
git+https://github.com/googlei18n/glyphsLib.git@ca7febea8b3cd2ee51e95dd84d9c6701825d29ae
git+https://github.com/googlei18n/fontmake.git@18b1dc235062ed7aec0485f40a778c369a526200
# for fontTools/varLib/interpolatable.py # for fontTools/varLib/interpolatable.py
numpy==1.15.1 numpy==1.15.4
scipy==1.1.0 scipy==1.1.0
munkres==1.0.12 munkres==1.0.12