Reformat with black (#974)

* Reformat with black

* Put black info and version in pyproject

* Run lint in CI

* Delete old experimental make_kit

* black the bin directory too

Author: simoncozens

.github/workflows/test.yml

@@ -29,7 +29,10 @@ jobs:
       - name: Install packages
         run: |
           pip install '.[qa]'
-          pip install mypy pytest
+          pip install '.[test]'
+      - name: lint
+        run: |
+            black . --check --diff --color
       - name: Run Tests
         env:
           DEV_FAMILY_DOWNLOAD: ${{ secrets.DEV_FAMILY_DOWNLOAD }}

Lib/gftools/actions/checkgooglefonts.py

@@ -1,12 +1,15 @@
 """Test whether the font should be PRed to GF, inform GitHub if so.
 """
+
 import yaml
 import os
 from sys import exit
 
 
 if __name__ == "__main__":
-    config = yaml.load(open(os.path.join("sources", "config.yaml")), Loader=yaml.FullLoader)
+    config = yaml.load(
+        open(os.path.join("sources", "config.yaml")), Loader=yaml.FullLoader
+    )
     if "googleFonts" in config and config["googleFonts"]:
         print("This font should be submitted to Google Fonts")
         print(f"::set-output name=is_gf::true")

Lib/gftools/actions/checkversionbump.py

@@ -17,6 +17,7 @@
     ::set-output name=newtag::v1.001
 
 """
+
 import yaml
 import os
 import re
@@ -64,7 +65,9 @@ def version_has_ever_changed(file, version):
 
 
 if __name__ == "__main__":
-    config = yaml.load(open(os.path.join("sources", "config.yaml")), Loader=yaml.FullLoader)
+    config = yaml.load(
+        open(os.path.join("sources", "config.yaml")), Loader=yaml.FullLoader
+    )
     sources = config["sources"]
 
     current_version = None

Lib/gftools/actions/getlatestversion.py

@@ -4,14 +4,19 @@
 from github import Github
 import re
 
+
 def get_latest_release(family, user=None, repo=None):
     if not (user and repo):
-        repo_url = subprocess.check_output(["git", "remote", "get-url", "origin"]).decode("utf8").strip()
+        repo_url = (
+            subprocess.check_output(["git", "remote", "get-url", "origin"])
+            .decode("utf8")
+            .strip()
+        )
         url_split = repo_url.split("/")
         user, repo = url_split[3], url_split[4]
 
     g = Github(os.environ["GITHUB_TOKEN"])
-    repo = g.get_repo(user + '/' + repo)
+    repo = g.get_repo(user + "/" + repo)
     for release in repo.get_releases():
         if release.draft:
             continue
@@ -27,16 +32,19 @@ def get_latest_release(family, user=None, repo=None):
         return version, download_url
     return None, None
 
+
 if __name__ == "__main__":
     import argparse
-    parser = argparse.ArgumentParser(description="Return the URL of a font's latest release artefact")
-    parser.add_argument('--user', help='the repository username', default="notofonts")
-    parser.add_argument('--repo', help='the repository name')
-    parser.add_argument('family', help='the font family name')
+
+    parser = argparse.ArgumentParser(
+        description="Return the URL of a font's latest release artefact"
+    )
+    parser.add_argument("--user", help="the repository username", default="notofonts")
+    parser.add_argument("--repo", help="the repository name")
+    parser.add_argument("family", help="the font family name")
     args = parser.parse_args()
 
     version, download_url = get_latest_release(args.family, args.user, args.repo)
     if version and download_url:
         print(f"::set-output name=version::{version}")
         print(f"::set-output name=url::{download_url}")
-

Lib/gftools/actions/qa2issue.py

@@ -9,19 +9,28 @@
 issue labelled qa-``version``. If not, it creates an issue with the text
 provided, and labels it accordingly; if there is, it adds the text as a new comment.
 """
+
 import argparse
 import subprocess
 from gftools.gfgithub import GitHubClient
 
 if __name__ == "__main__":
-    url_split = subprocess.check_output(["git", "remote", "get-url", "origin"]).decode("utf8").strip().split("/")
+    url_split = (
+        subprocess.check_output(["git", "remote", "get-url", "origin"])
+        .decode("utf8")
+        .strip()
+        .split("/")
+    )
     client = GitHubClient(url_split[3], url_split[4])
 
-    parser = argparse.ArgumentParser(description='Create or update github issue')
-    parser.add_argument('--template', help='the issue name',
-        default="Fontbakery QA Report for Version {}")
-    parser.add_argument('version', help='the proposed version')
-    parser.add_argument('file', help='file containing MarkDown content')
+    parser = argparse.ArgumentParser(description="Create or update github issue")
+    parser.add_argument(
+        "--template",
+        help="the issue name",
+        default="Fontbakery QA Report for Version {}",
+    )
+    parser.add_argument("version", help="the proposed version")
+    parser.add_argument("file", help="file containing MarkDown content")
     args = parser.parse_args()
 
     label = f"qa-{args.version}"
@@ -45,4 +54,6 @@
         client._post(client.rest_url(f"issues/{number}/labels"), {"labels": [label]})
     see_url = response["html_url"]
 
-    print(f"::error file=sources/config.yaml,title=Fontbakery check failed::See {see_url}")
+    print(
+        f"::error file=sources/config.yaml,title=Fontbakery check failed::See {see_url}"
+    )

Lib/gftools/axes_pb2.py

@@ -14,6 +14,7 @@
 Credit to Cosimo Lupo (anthrotype) for starting this as a gist:
 https://gist.github.com/anthrotype/531a425c8a0ba5ee975bc2ec8add7b82
 """
+
 from collections import deque, defaultdict
 import re
 from typing import (

Lib/gftools/builder/dependencies.py

@@ -26,7 +26,6 @@ def sources(self) -> List[File]:
         return [get_file(str(p)) for p in self.config["sources"]]
 
 
-
 def get_provider(provider: str):
     # First try gftools.builder.recipeproviders.X
     try:

Lib/gftools/builder/recipeproviders/__init__.py

@@ -45,30 +45,30 @@
 NAMEID_DARK_BACKGROUD_PALETTE = 24
 
 NAMEID_STR = {
-  NAMEID_COPYRIGHT_NOTICE: "COPYRIGHT_NOTICE",
-  NAMEID_FONT_FAMILY_NAME: "FONT_FAMILY_NAME",
-  NAMEID_FONT_SUBFAMILY_NAME: "FONT_SUBFAMILY_NAME",
-  NAMEID_UNIQUE_FONT_IDENTIFIER: "UNIQUE_FONT_IDENTIFIER",
-  NAMEID_FULL_FONT_NAME: "FULL_FONT_NAME",
-  NAMEID_VERSION_STRING: "VERSION_STRING",
-  NAMEID_POSTSCRIPT_NAME: "POSTSCRIPT_NAME",
-  NAMEID_TRADEMARK: "TRADEMARK",
-  NAMEID_MANUFACTURER_NAME: "MANUFACTURER_NAME",
-  NAMEID_DESIGNER: "DESIGNER",
-  NAMEID_DESCRIPTION: "DESCRIPTION",
-  NAMEID_VENDOR_URL: "VENDOR_URL",
-  NAMEID_DESIGNER_URL: "DESIGNER_URL",
-  NAMEID_LICENSE_DESCRIPTION: "LICENSE_DESCRIPTION",
-  NAMEID_LICENSE_INFO_URL: "LICENSE_INFO_URL",
-  NAMEID_TYPOGRAPHIC_FAMILY_NAME: "TYPOGRAPHIC_FAMILY_NAME",
-  NAMEID_TYPOGRAPHIC_SUBFAMILY_NAME: "TYPOGRAPHIC_SUBFAMILY_NAME",
-  NAMEID_COMPATIBLE_FULL_MACONLY: "COMPATIBLE_FULL_MACONLY",
-  NAMEID_SAMPLE_TEXT: "SAMPLE_TEXT",
-  NAMEID_POSTSCRIPT_CID_NAME: "POSTSCRIPT_CID_NAME",
-  NAMEID_WWS_FAMILY_NAME: "WWS_FAMILY_NAME",
-  NAMEID_WWS_SUBFAMILY_NAME: "WWS_SUBFAMILY_NAME",
-  NAMEID_LIGHT_BACKGROUND_PALETTE: "LIGHT_BACKGROUND_PALETTE",
-  NAMEID_DARK_BACKGROUD_PALETTE: "DARK_BACKGROUD_PALETTE"
+    NAMEID_COPYRIGHT_NOTICE: "COPYRIGHT_NOTICE",
+    NAMEID_FONT_FAMILY_NAME: "FONT_FAMILY_NAME",
+    NAMEID_FONT_SUBFAMILY_NAME: "FONT_SUBFAMILY_NAME",
+    NAMEID_UNIQUE_FONT_IDENTIFIER: "UNIQUE_FONT_IDENTIFIER",
+    NAMEID_FULL_FONT_NAME: "FULL_FONT_NAME",
+    NAMEID_VERSION_STRING: "VERSION_STRING",
+    NAMEID_POSTSCRIPT_NAME: "POSTSCRIPT_NAME",
+    NAMEID_TRADEMARK: "TRADEMARK",
+    NAMEID_MANUFACTURER_NAME: "MANUFACTURER_NAME",
+    NAMEID_DESIGNER: "DESIGNER",
+    NAMEID_DESCRIPTION: "DESCRIPTION",
+    NAMEID_VENDOR_URL: "VENDOR_URL",
+    NAMEID_DESIGNER_URL: "DESIGNER_URL",
+    NAMEID_LICENSE_DESCRIPTION: "LICENSE_DESCRIPTION",
+    NAMEID_LICENSE_INFO_URL: "LICENSE_INFO_URL",
+    NAMEID_TYPOGRAPHIC_FAMILY_NAME: "TYPOGRAPHIC_FAMILY_NAME",
+    NAMEID_TYPOGRAPHIC_SUBFAMILY_NAME: "TYPOGRAPHIC_SUBFAMILY_NAME",
+    NAMEID_COMPATIBLE_FULL_MACONLY: "COMPATIBLE_FULL_MACONLY",
+    NAMEID_SAMPLE_TEXT: "SAMPLE_TEXT",
+    NAMEID_POSTSCRIPT_CID_NAME: "POSTSCRIPT_CID_NAME",
+    NAMEID_WWS_FAMILY_NAME: "WWS_FAMILY_NAME",
+    NAMEID_WWS_SUBFAMILY_NAME: "WWS_SUBFAMILY_NAME",
+    NAMEID_LIGHT_BACKGROUND_PALETTE: "LIGHT_BACKGROUND_PALETTE",
+    NAMEID_DARK_BACKGROUD_PALETTE: "DARK_BACKGROUD_PALETTE",
 }
 
 # Platform IDs:
@@ -79,17 +79,17 @@
 PLATFORM_ID__CUSTOM = 4
 
 PLATID_STR = {
-  PLATFORM_ID__UNICODE: "UNICODE",
-  PLATFORM_ID__MACINTOSH: "MACINTOSH",
-  PLATFORM_ID__ISO: "ISO",
-  PLATFORM_ID__WINDOWS: "WINDOWS",
-  PLATFORM_ID__CUSTOM: "CUSTOM"
+    PLATFORM_ID__UNICODE: "UNICODE",
+    PLATFORM_ID__MACINTOSH: "MACINTOSH",
+    PLATFORM_ID__ISO: "ISO",
+    PLATFORM_ID__WINDOWS: "WINDOWS",
+    PLATFORM_ID__CUSTOM: "CUSTOM",
 }
 
 OFL_LICENSE_INFO = (
-  "This Font Software is licensed under the SIL Open Font License, "
-  "Version 1.1. This license is available with a FAQ at: "
-  "https://openfontlicense.org"
+    "This Font Software is licensed under the SIL Open Font License, "
+    "Version 1.1. This license is available with a FAQ at: "
+    "https://openfontlicense.org"
 )
 
 OFL_LICENSE_URL = "https://openfontlicense.org"
@@ -184,4 +184,4 @@
 INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE."""
+OTHER DEALINGS IN THE FONT SOFTWARE."""