diff --git a/.github/workflows/install_run.yml b/.github/workflows/install_run.yml index cc4ab3a094..847ada0adb 100644 --- a/.github/workflows/install_run.yml +++ b/.github/workflows/install_run.yml @@ -78,10 +78,6 @@ jobs: name: adobefonts args: >- data/test/source-sans-pro/VAR/SourceSansVariable-Roman.ttf - - description: Shaping checks - extras: ".[shaping]" - name: shaping - args: data/test/mada/Mada-Regular.ttf - description: Google Fonts extras: ".[googlefonts]" name: googlefonts diff --git a/CHANGELOG.md b/CHANGELOG.md index 33799b841b..7e116972ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ A more detailed list of changes is available in the corresponding milestones for ## Upcoming release: 0.12.10 (2024-Jul-??) ### Noteworthy code changes - The **UFO** profile was removed and its checks were migrated to the **Universal** profile. For that reason, all of them received a temporary "experimental" flag (issue #4801) + - The **shaping** profile was also removed and its checks migrated to the **Google Fonts** profile. As gfonts was already including those, and no other profile did so, there's no need to add experimental flags to these ones. (issue #4801) ### Changes to existing checks - **EXPERIMENTAL - [com.daltonmaag/check/consistent_curve_type]:**: remove usage of `ufoLib2` APIs. (PR #4802) diff --git a/Lib/fontbakery/cli.py b/Lib/fontbakery/cli.py index 32f433c118..c75bafe926 100644 --- a/Lib/fontbakery/cli.py +++ b/Lib/fontbakery/cli.py @@ -45,7 +45,6 @@ "microsoft", "notofonts", "opentype", - "shaping", "typenetwork", "universal", ] diff --git a/Lib/fontbakery/profiles/googlefonts.py b/Lib/fontbakery/profiles/googlefonts.py index 776b710f1c..f5444c15ee 100644 --- a/Lib/fontbakery/profiles/googlefonts.py +++ b/Lib/fontbakery/profiles/googlefonts.py @@ -1,5 +1,5 @@ PROFILE = { - "include_profiles": ["universal", "outline", "shaping"], + "include_profiles": ["universal", "outline"], "sections": { "Article Checks": [ "com.google.fonts/check/article/images", @@ -101,6 +101,13 @@ "com.google.fonts/check/repo/vf_has_static_fonts", "com.google.fonts/check/repo/zip_files", ], + "Shaping Checks": [ + "com.google.fonts/check/shaping/regression", + "com.google.fonts/check/shaping/forbidden", + "com.google.fonts/check/shaping/collides", + "com.google.fonts/check/dotted_circle", + "com.google.fonts/check/soft_dotted", + ], "Font File Checks": [ "com.google.fonts/check/aat", "com.google.fonts/check/canonical_filename", diff --git a/Lib/fontbakery/profiles/shaping.py b/Lib/fontbakery/profiles/shaping.py deleted file mode 100644 index d1e31c87f3..0000000000 --- a/Lib/fontbakery/profiles/shaping.py +++ /dev/null @@ -1,11 +0,0 @@ -PROFILE = { - "sections": { - "Shaping Checks": [ - "com.google.fonts/check/shaping/regression", - "com.google.fonts/check/shaping/forbidden", - "com.google.fonts/check/shaping/collides", - "com.google.fonts/check/dotted_circle", - "com.google.fonts/check/soft_dotted", - ] - } -} diff --git a/docs/source/fontbakery/profiles/index.rst b/docs/source/fontbakery/profiles/index.rst index 7c66639273..dd7f2af506 100644 --- a/docs/source/fontbakery/profiles/index.rst +++ b/docs/source/fontbakery/profiles/index.rst @@ -15,4 +15,3 @@ profiles fontval iso15008 outline - shaping diff --git a/pyproject.toml b/pyproject.toml index ddece81884..32616a4cc4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,6 +102,10 @@ fontwerk = [ ] googlefonts = [ + "collidoscope >= 0.5.2", + # 0.5.2 added Python 3.11 wheels + # (see https://github.com/fonttools/fontbakery/issues/3970) + "dehinter >= 3.1.0", # 3.1.0 added dehinter.font.hint function @@ -113,11 +117,13 @@ googlefonts = [ # We cannot use v4 because our protobuf files have been compiled with v3. # (see https://github.com/fonttools/fontbakery/issues/2200) + "stringbrewer", + "unicodedata2", "fontbakery[beautifulsoup4]", "fontbakery[googlefontsalwayslatest]", - "fontbakery[shaping]", + "fontbakery[shaperglot]", ] iso15008 = [] @@ -128,17 +134,6 @@ notofonts = [ "fontbakery[googlefonts]", ] -# FIXME: This is not a vendor-specific profile! -shaping = [ - "collidoscope >= 0.5.2", - # 0.5.2 added Python 3.11 wheels - # (see https://github.com/fonttools/fontbakery/issues/3970) - - "stringbrewer", - - "fontbakery[shaperglot]", -] - typenetwork = [ "unicodedata2", @@ -167,7 +162,6 @@ all = [ "fontbakery[googlefonts]", "fontbakery[iso15008]", "fontbakery[notofonts]", - "fontbakery[shaping]", "fontbakery[typenetwork]", ]