fix: Update project template

kiwari-kolektiv-studio · Jul 7, 2023 · 0b3aae5 · 0b3aae5
1 parent 1cf175a
commit 0b3aae5
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 185 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,70 +6,70 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-      - name: Install sys tools/deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install ttfautohint
-          sudo snap install yq
-      - uses: actions/cache@v2
-        with:
-          path: ./venv/
-          key: ${{ runner.os }}-venv-${{ hashFiles('**/requirements*.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-venv-
-      - name: Do first-run script if necessary
-        run: make .init.stamp
-        if: github.repository != 'googlefonts/googlefonts-project-template'
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        name: First-run setup
-        if: github.repository != 'googlefonts/googlefonts-project-template'
-        with:
-          file_pattern: .init.stamp README.md requirements.txt OFL.txt
-          commit_message: "Personalize for this repo"
-      - name: gen zip file name
-        id: zip-name
-        shell: bash
-        # Set the archive name to repo name + "-assets" e.g "MavenPro-assets"
-        run: echo "ZIP_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')-fonts" >> $GITHUB_ENV
-        # If a new release is cut, use the release tag to auto-bump the source files
-      - name: Bump release
-        if: github.event_name == 'release'
-        run: |
-          . venv/bin/activate
-          SRCS=$(yq e ".sources[]" sources/config.yaml)
-          TAG_NAME=${GITHUB_REF/refs\/tags\//}
-          echo "Bumping $SRCS to $TAG_NAME"
-          for src in $SRCS
-          do
-            bumpfontversion sources/$src --new-version $TAG_NAME;
-          done
-      - name: Build font
-        run: make build
-      - name: Check with fontbakery
-        run: make test
-        continue-on-error: true
-      - name: proof
-        run: make proof
-      - name: setup site
-        run: cp scripts/index.html out/index.html
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        if: ${{ github.ref == 'refs/heads/main' }}
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./out
-      - name: Archive artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.ZIP_NAME }}
-          path: |
-            fonts
-            out
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install sys tools/deps
+      run: |
+        sudo apt-get update
+        sudo apt-get install ttfautohint
+        sudo snap install yq
+    - uses: actions/cache@v2
+      with:
+        path: ./venv/
+        key: ${{ runner.os }}-venv-${{ hashFiles('**/requirements*.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-venv-
+    - name: Do first-run script if necessary
+      run: make .init.stamp
+      if: github.repository != 'googlefonts/googlefonts-project-template'
+    - uses: stefanzweifel/git-auto-commit-action@v4
+      name: First-run setup
+      if: github.repository != 'googlefonts/googlefonts-project-template'
+      with:
+        file_pattern: .init.stamp README.md requirements.txt OFL.txt
+        commit_message: "Personalize for this repo"
+    - name: gen zip file name
+      id: zip-name
+      shell: bash
+      # Set the archive name to repo name + "-assets" e.g "MavenPro-assets"
+      run: echo "ZIP_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')-fonts" >> $GITHUB_ENV
+      # If a new release is cut, use the release tag to auto-bump the source files
+    - name: Bump release
+      if: github.event_name == 'release'
+      run: |
+        . venv/bin/activate
+        SRCS=$(yq e ".sources[]" sources/config.yaml)
+        TAG_NAME=${GITHUB_REF/refs\/tags\//}
+        echo "Bumping $SRCS to $TAG_NAME"
+        for src in $SRCS
+        do
+          bumpfontversion sources/$src --new-version $TAG_NAME;
+        done
+    - name: Build font
+      run: make build
+    - name: Check with fontbakery
+      run: make test
+      continue-on-error: true
+    - name: proof
+      run: make proof
+    - name: setup site
+      run: cp scripts/index.html out/index.html
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      if: ${{ github.ref == 'refs/heads/main' }}
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./out
+    - name: Archive artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.ZIP_NAME }}
+        path: |
+          fonts
+          out
     outputs:
       zip_name: ${{ env.ZIP_NAME }}
   release:

diff --git a/requirements.txt b/requirements.txt
@@ -1,121 +1,7 @@
-absl-py==1.4.0
-appdirs==1.4.4
-attrs==23.1.0
-axisregistry==0.4.3
-babelfont==3.0.1
-beautifulsoup4==4.12.2
-beziers==0.5.0
-blackrenderer==0.6.0
-booleanOperations==0.9.0
-Brotli==1.0.9
-bump2version==1.0.1
-bumpfontversion==0.4.1
-cattrs==23.1.2
-certifi==2023.5.7
-cffi==1.15.1
-cffsubr==0.2.9.post1
-charset-normalizer==3.1.0
-click==8.1.3
-cmarkgfm==2022.10.27
-collidoscope==0.6.5
-colorlog==6.7.0
-commandlines==0.4.1
-compreffor==0.5.3
-cryptography==41.0.1
-cu2qu==1.6.7.post2
-defcon==0.10.2
-dehinter==4.0.0
-Deprecated==1.2.14
-diffenator2==0.2.6
-drawbot-skia==0.5.0
-exceptiongroup==1.1.2
-font-v==2.1.0
-fontbakery==0.8.13
-fontFeatures==1.7.4
-fontmake==3.6.0
-fontMath==0.9.3
-fonttools==4.40.0
-freetype-py==2.4.0
-fs==2.4.16
-gflanguages==0.8.9
-gftools==0.9.32
-gitdb==4.0.10
-GitPython==3.1.31
-glyphsets==0.6.2
-glyphsLib==6.2.2
-glyphtools==0.8.0
-h11==0.14.0
-hyperglot==0.4.5
-idna==3.4
-Jinja2==3.1.2
-kurbopy==0.9.0
-lxml==4.9.2
-markdown-it-py==3.0.0
-MarkupSafe==2.1.3
-mdurl==0.1.2
-munkres==1.1.4
-nanoemoji==0.15.1
-ninja==1.11.1
-numpy==1.25.0
-openstep-plist==0.3.0.post1
-opentype-sanitizer==9.1.0
-opentypespec==1.9.1
-orjson==3.9.1
-outcome==1.2.0
-packaging==23.1
-picosvg==0.22.0
-Pillow==10.0.0
-pip-api==0.0.30
-pngquant-cli==2.17.0.post5
-protobuf==3.20.3
-pyahocorasick==2.0.0
-pybind11==2.10.4
-pyclipper==1.3.0.post4
-pycparser==2.21
-pygit2==1.12.2
-PyGithub==1.59.0
-Pygments==2.15.1
-PyJWT==2.7.0
-PyNaCl==1.5.0
-pyparsing==3.1.0
-PySocks==1.7.1
-python-bidi==0.4.2
-python-dateutil==2.8.2
-PyYAML==6.0
-regex==2023.6.3
-requests==2.31.0
-resvg-cli==0.22.0.post3
-rich==13.4.2
-rstr==3.2.1
-selenium==4.10.0
-sh==2.0.4
-six==1.16.0
-skia-pathops==0.8.0
-skia-python==87.5
-smmap==5.0.0
-sniffio==1.3.0
-sortedcontainers==2.4.0
-soupsieve==2.4.1
-sre-yield==1.2
-statmake==0.6.0
-strictyaml==1.7.3
-stringbrewer==0.0.1
-tabulate==0.9.0
-toml==0.10.2
-tqdm==4.65.0
-trio==0.22.1
-trio-websocket==0.10.3
-ttfautohint-py==0.5.1
-ufo2ft==2.32.0
-ufoLib2==0.14.0
-ufolint==1.2.0
-uharfbuzz==0.37.0
-unicodedata2==15.0.0
-Unidecode==1.3.6
-urllib3==2.0.3
-vharfbuzz==0.2.0
-vttLib==0.12.0
-wrapt==1.15.0
-wsproto==1.2.0
-youseedee==0.3.0
-zopfli==0.2.2
+fontmake>=2.4
+fontbakery>=0.8.11
+gftools[qa]>=0.9.23
+drawbot-skia>=0.4.8
+sh>=1.14.2
+bumpfontversion>=0.2.0
+diffenator2>=0.2.5