Update build deps

Author: tonsky

.github/workflows/build.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - '.github/workflows/**'
       - 'FiraCode.glyphs'
+      - 'requirements.txt'
       - 'script/**'
 
 jobs:
@@ -36,7 +37,7 @@ jobs:
     - name: Install Python Dependencies
       run: |
         pip install --upgrade pip
-        pip install fontmake glyphsLib gftools fontbakery ufo2ft statmake
+        pip install -r requirements.txt
     - if: startsWith(github.ref, 'refs/tags/')
       run: python3 ./script/update_version.py
     - run: ./script/build.sh

.gitignore

@@ -17,4 +17,5 @@ distr/*/
 .idea
 .fleet
 *.iml
-*.glyphspackage
+*.glyphspackage
+.vibe

Dockerfile

@@ -2,7 +2,8 @@ FROM python:3
 
 WORKDIR /opt
 
-RUN pip install --upgrade Pillow==5.4.1 idna==2.8 requests==2.21.0 urllib3==1.24.1 pycairo==1.20.1 gftools==0.7.4 fontmake==2.4.0 fontbakery==0.8.0
+COPY requirements.txt .
+RUN pip install -r requirements.txt
 RUN apt-get update && \
     apt-get install -y ttfautohint && \
     apt-get install -y woff2 && \

FiraCode.glyphs

@@ -26,9 +26,10 @@
         [_ name code'] (re-matches #"(?s)###[ ]*([^\n]*[^\n ])[ ]*\n(.*)" code)
         code           (trim (or code' code))
         feature        (cond-> {:code code}
-                         name (assoc :labels
-                                [{:language "dflt"
-                                  :value    name}])
+                         (and (str/starts-with? tag "ss") name)
+                         (assoc :labels
+                           [{:language "dflt"
+                             :value    name}])
                          true (assoc :tag tag))]
     (glyphs/set-feature font tag feature)))
 

clojure/fira_code/features.clj

@@ -0,0 +1,6 @@
+fontmake==3.11.1
+glyphsLib==6.12.7
+gftools==0.9.993
+fontbakery==1.1.0
+ufo2ft==3.7.0
+uharfbuzz==0.53.3

requirements.txt

@@ -10,11 +10,5 @@ python3.8 -m pip install virtualenv --user
 python3.8 -m virtualenv venv
 source venv/bin/activate
 
-# https://github.com/googlefonts/gftools/issues/121
-python3.8 -m pip install -U Pillow==5.4.1 idna==2.8 requests==2.21.0 urllib3==1.24.1
 export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig"
-python3.8 -m pip install pycairo
-python3.8 -m pip install git+https://github.com/googlefonts/gftools
-
-python3.8 -m pip install fontmake
-python3.8 -m pip install fontbakery
+python3.8 -m pip install -r requirements.txt

script/bootstrap_linux.sh

@@ -6,17 +6,11 @@ brew install python@3.12
 python3.12 -m venv venv
 source venv/bin/activate
 
-## https://github.com/googlefonts/gftools/issues/121
 brew install pkg-config
 brew install zlib
-pip install -U Pillow==8.0.1 idna==2.8 requests==2.21.0 urllib3==1.24.1
 export PKG_CONFIG_PATH="/opt/homebrew/opt/libffi/lib/pkgconfig"
-pip install pycairo
-pip install gftools
-
-pip install fontmake
+pip install -r requirements.txt
 brew install ttfautohint
 brew install woff2
 brew tap bramstein/webfonttools
-brew install sfnt2woff-zopfli
-pip install fontbakery
+brew install sfnt2woff-zopfli