Upgrade toolchain to Python 3, fontmake 1.8.0 and numpy 1.15.4

init.sh

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

misc/fontbuild

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

requirements.txt

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