Skip to content

Commit

Permalink
rename ufo_sources to merely ufo
Browse files Browse the repository at this point in the history
...because there seems to be a problem
with using underscore chars on extra names;

I will actually soon drop the UFO profile, and instead include the
checks on Universal profile.
  • Loading branch information
felipesanches committed Mar 13, 2024
1 parent 3aee94d commit 55f5324
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 22 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/install_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Lib/fontbakery/checks/ufo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Lib/fontbakery/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"opentype",
"shaping",
"typenetwork",
"ufo_sources",
"ufo",
"universal",
]

Expand Down
2 changes: 1 addition & 1 deletion Lib/fontbakery/profiles/googlefonts.py
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/source/fontbakery/profiles/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ profiles
fontbureau
fontwerk
fontval
ufo_sources
ufo
iso15008
outline
shaping
5 changes: 5 additions & 0 deletions docs/source/fontbakery/profiles/ufo.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
###
UFO
###

.. autoprofile:: fontbakery.profiles.ufo
5 changes: 0 additions & 5 deletions docs/source/fontbakery/profiles/ufo_sources.rst

This file was deleted.

2 changes: 1 addition & 1 deletion docs/source/user/USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ googlefonts = [
"fontbakery[beautifulsoup4]",
"fontbakery[googlefontsalwayslatest]",
"fontbakery[shaping]",
"fontbakery[ufo_sources]",
"fontbakery[ufo]",
]

iso15008 = []
Expand Down Expand Up @@ -146,7 +146,7 @@ typenetwork = [
]

# FIXME: This is not a vendor-specific profile!
"ufo_sources" = [
ufo = [
"defcon",
"fonttools[ufo]",
"ufolint",
Expand Down Expand Up @@ -176,7 +176,7 @@ all = [
"fontbakery[iso15008]",
"fontbakery[notofonts]",
"fontbakery[shaping]",
"fontbakery[ufo_sources]",
"fontbakery[ufo]",
]


Expand Down
2 changes: 1 addition & 1 deletion tests/commands/test_usage.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_command_check_googlefonts():
[
"check-profile",
"check-opentype",
"check-ufo-sources",
"check-ufo",
],
)
def test_command_check_profile(subcommand):
Expand Down

0 comments on commit 55f5324

Please sign in to comment.