diff --git a/.github/workflows/install_run.yml b/.github/workflows/install_run.yml index f58ee2c25d..3be72266e2 100644 --- a/.github/workflows/install_run.yml +++ b/.github/workflows/install_run.yml @@ -95,18 +95,18 @@ jobs: - name: Try running UFO Sources checks run: >- - fontbakery check-ufo-sources --verbose data/test/test.ufo + fontbakery check-ufo --verbose data/test/test.ufo || exit 0 shell: bash - - name: Install `ufo_sources` extra + - name: Install `ufo` extra run: | - python -m pip install '.[ufo_sources]' + python -m pip install '.[ufo]' - - name: Run UFO Sources checks + - name: Run UFO checks run: >- - fontbakery check-ufo-sources --verbose data/test/test.ufo; - fontbakery check-ufo-sources -x designspace_has_consistent + fontbakery check-ufo --verbose data/test/test.ufo; + fontbakery check-ufo -x designspace_has_consistent "data/test/stupidfont/Stupid Font.designspace" - name: Install `shaping` extra diff --git a/Lib/fontbakery/checks/ufo.py b/Lib/fontbakery/checks/ufo.py index 03659fec19..450376d7b6 100644 --- a/Lib/fontbakery/checks/ufo.py +++ b/Lib/fontbakery/checks/ufo.py @@ -20,7 +20,7 @@ def ufo_font(ufo): from fontTools.ufoLib.errors import UFOLibError import defcon except ImportError: - exit_with_install_instructions("ufo-sources") + exit_with_install_instructions("ufo") try: return defcon.Font(ufo.file) @@ -40,7 +40,7 @@ def designSpace(designspace): from fontTools.designspaceLib import DesignSpaceDocument import defcon except ImportError: - exit_with_install_instructions("ufo-sources") + exit_with_install_instructions("ufo") if designspace: DS = DesignSpaceDocument.fromfile(designspace.file) @@ -57,7 +57,7 @@ def designspace_sources(designspace): try: import defcon except ImportError: - exit_with_install_instructions("ufo-sources") + exit_with_install_instructions("ufo") if designspace.designSpace: return designspace.designSpace.loadSourceFonts(defcon.Font) diff --git a/Lib/fontbakery/cli.py b/Lib/fontbakery/cli.py index 8a6271329d..1125da701b 100644 --- a/Lib/fontbakery/cli.py +++ b/Lib/fontbakery/cli.py @@ -46,7 +46,7 @@ "opentype", "shaping", "typenetwork", - "ufo_sources", + "ufo", "universal", ] diff --git a/Lib/fontbakery/profiles/googlefonts.py b/Lib/fontbakery/profiles/googlefonts.py index bb49cffbe6..315b624b24 100644 --- a/Lib/fontbakery/profiles/googlefonts.py +++ b/Lib/fontbakery/profiles/googlefonts.py @@ -1,5 +1,5 @@ PROFILE = { - "include_profiles": ["universal", "outline", "shaping", "ufo_sources"], + "include_profiles": ["universal", "outline", "shaping", "ufo"], "sections": { "Metadata Checks": [ "com.google.fonts/check/metadata/parses", diff --git a/Lib/fontbakery/profiles/ufo_sources.py b/Lib/fontbakery/profiles/ufo.py similarity index 100% rename from Lib/fontbakery/profiles/ufo_sources.py rename to Lib/fontbakery/profiles/ufo.py diff --git a/docs/source/fontbakery/profiles/index.rst b/docs/source/fontbakery/profiles/index.rst index b49bfc1866..8a05cff675 100644 --- a/docs/source/fontbakery/profiles/index.rst +++ b/docs/source/fontbakery/profiles/index.rst @@ -13,7 +13,7 @@ profiles fontbureau fontwerk fontval - ufo_sources + ufo iso15008 outline shaping diff --git a/docs/source/fontbakery/profiles/ufo.rst b/docs/source/fontbakery/profiles/ufo.rst new file mode 100644 index 0000000000..72a1fbf8b2 --- /dev/null +++ b/docs/source/fontbakery/profiles/ufo.rst @@ -0,0 +1,5 @@ +### +UFO +### + +.. autoprofile:: fontbakery.profiles.ufo diff --git a/docs/source/fontbakery/profiles/ufo_sources.rst b/docs/source/fontbakery/profiles/ufo_sources.rst deleted file mode 100644 index ac7ab33da7..0000000000 --- a/docs/source/fontbakery/profiles/ufo_sources.rst +++ /dev/null @@ -1,5 +0,0 @@ -########### -UFO Sources -########### - -.. autoprofile:: fontbakery.profiles.ufo_sources diff --git a/docs/source/user/USAGE.md b/docs/source/user/USAGE.md index 35fb131b3f..1fba592c81 100644 --- a/docs/source/user/USAGE.md +++ b/docs/source/user/USAGE.md @@ -16,7 +16,7 @@ This has several subcommands, described in the help function: check-googlefonts check-notofonts check-profile - check-ufo-sources + check-ufo check-universal generate-glyphdata diff --git a/pyproject.toml b/pyproject.toml index 26c2b5340e..7cb477cb5e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -118,7 +118,7 @@ googlefonts = [ "fontbakery[beautifulsoup4]", "fontbakery[googlefontsalwayslatest]", "fontbakery[shaping]", - "fontbakery[ufo_sources]", + "fontbakery[ufo]", ] iso15008 = [] @@ -146,7 +146,7 @@ typenetwork = [ ] # FIXME: This is not a vendor-specific profile! -"ufo_sources" = [ +ufo = [ "defcon", "fonttools[ufo]", "ufolint", @@ -176,7 +176,7 @@ all = [ "fontbakery[iso15008]", "fontbakery[notofonts]", "fontbakery[shaping]", - "fontbakery[ufo_sources]", + "fontbakery[ufo]", ] diff --git a/tests/commands/test_usage.py b/tests/commands/test_usage.py index 08afa51743..c986db5902 100644 --- a/tests/commands/test_usage.py +++ b/tests/commands/test_usage.py @@ -48,7 +48,7 @@ def test_command_check_googlefonts(): [ "check-profile", "check-opentype", - "check-ufo-sources", + "check-ufo", ], ) def test_command_check_profile(subcommand):