From 788b3d52901ae099b651c7a336409ab044b71b75 Mon Sep 17 00:00:00 2001 From: Nicolas Spalinger Date: Tue, 20 Aug 2024 14:12:59 -0500 Subject: [PATCH] Bumped up fontbakery version to current release, adjusted integration (it is already more verbose by default on the output) --- docker/smith-constraints.txt | 2 +- docker/smith-requirements.txt | 2 +- src/smithlib/package.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/smith-constraints.txt b/docker/smith-constraints.txt index 254f05e5..0d362453 100644 --- a/docker/smith-constraints.txt +++ b/docker/smith-constraints.txt @@ -6,7 +6,7 @@ diffenator2 #fontaine @ git+https://github.com/googlefonts/pyfontaine fontaine #fontbakery @ git+https://github.com/fonttools/fontbakery -fontbakery==0.12.0 +fontbakery==0.12.10 fontmake @ git+https://github.com/googlei18n/fontmake fontMath @ git+https://github.com/robotools/fontMath fontParts @ git+https://github.com/robotools/fontParts diff --git a/docker/smith-requirements.txt b/docker/smith-requirements.txt index 42a9dff3..b94e8c2d 100644 --- a/docker/smith-requirements.txt +++ b/docker/smith-requirements.txt @@ -4,7 +4,7 @@ compreffor diffenator2 fontaine -fontbakery +fontbakery [all,googlefonts] fontmake gftools MutatorMath diff --git a/src/smithlib/package.py b/src/smithlib/package.py index 28060d98..5ea09fcb 100644 --- a/src/smithlib/package.py +++ b/src/smithlib/package.py @@ -997,13 +997,13 @@ def execute(self) : familynames = files.split("-") fullfamilynames = familynames[0] if os.path.exists(toppath + "/fontbakery.yaml"): - print("Using local fontbakery.yaml file as well as pysilfont profile...") - Utils.subprocess.Popen("fontbakery check-profile silfont.fbtests.profile " + outputpath + "/" + fullfamilynames + "-*.ttf" + " --config " + toppath + "/fontbakery.yaml" + " --html " + outputpath + "/fontbakery-report-" + fullfamilynames + ".html" + " -F --succinct -S -C", shell = 1).wait() - Utils.subprocess.Popen("echo ' ' ", shell = 1).wait() + print("Running Font Bakery using the local fontbakery.yaml file as well as the pysilfont profile for " + fullfamilynames + "...") + Utils.subprocess.Popen("fontbakery check-profile silfont.fbtests.profile " + outputpath + "/" + fullfamilynames + "-*.ttf" + " --config " + toppath + "/fontbakery.yaml" + " --html " + outputpath + "/fontbakery-report-" + fullfamilynames + ".html" + " -q --skip-network -S -F -C -j -l PASS -m PASS", shell = 1).wait() + print("Done, see the generated HTML report for all the details.") else: - print("Using pysilfont profile...") - Utils.subprocess.Popen("fontbakery check-profile silfont.fbtests.profile " + outputpath + "/" + fullfamilynames + "-*.ttf" + " --html " + outputpath + "/fontbakery-report-" + fullfamilynames + ".html" + " -F --succinct -S -C", shell = 1).wait() - Utils.subprocess.Popen("echo ' ' ", shell = 1).wait() + print("Running Font Bakery using the pysilfont profile for " + fullfamilynames + "...") + Utils.subprocess.Popen("fontbakery check-profile silfont.fbtests.profile " + outputpath + "/" + fullfamilynames + "-*.ttf" + " --html " + outputpath + "/fontbakery-report-" + fullfamilynames + ".html" + " -q --skip-network -S -F -C -j -l PASS -m PASS", shell = 1).wait() + print("Done, see the generated HTML report for all the details.") class differContext(Context.Context) : """Run diffenator2 for regression testing."""