Merge pull request #223 from googlefonts/fix-tests

Fix tests

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
         run: |
           git clone https://github.com/fonttools/fontbakery.git
           cd fontbakery
-          pip install '.[all]'
+          pip install '.[tests]'
           cd ..
           pip install '.[dev]'
           pip freeze

GLYPHSETS.md

@@ -78,7 +78,7 @@ Glyphs.app Custom Filter List (contains all Arabic glyphsets): [CustomFilter_GF_
 * Script: Arabic
 * List of languages: `
 Central Kurdish (ckb_Arab),
-Malay (Arabic) (ms_Arab),
+Malay (Arabic) (zlm_Arab),
 Pashto (ps_Arab),
 Sindhi (sd_Arab),
 Uyghur (ug_Arab)
@@ -733,7 +733,7 @@ Spanish (es_Latn)
 `
 
 
-The following list of **601** languages is computed as a result of the dynamic conditions described above:
+The following list of **602** languages is computed as a result of the dynamic conditions described above:
 
 `
 Abidji (abi_Latn),
@@ -775,12 +775,12 @@ Bacama (bcy_Latn),
 Bafia (ksf_Latn),
 Bafut (bfd_Latn),
 Baga Sitemu (bsp_Latn),
-Baka (Cameroon/Gabon) (bkc_Latn),
-Baka (DRC/South Sudan) (bdh_Latn),
+Baka, Cameroon/Gabon (bkc_Latn),
+Baka, DRC/South Sudan (bdh_Latn),
 Balanta-Ganja (bjt_Latn),
 Bali (bcn_Latn),
 Bambara (bm_Latn),
-Bamun, Latin (bax_Latn),
+Bamun (Latin) (bax_Latn),
 Bana (bcw_Latn),
 Banda, West Central (bbp_Latn),
 Bandi (bza_Latn),
@@ -791,7 +791,7 @@ Bapuku (bnm_Latn),
 Bari (bfa_Latn),
 Basa (bzw_Latn),
 Basaa (bas_Latn),
-Bassa, Latin (bsq_Latn),
+Bassa (Latin) (bsq_Latn),
 Bassari (bsc_Latn),
 Bedawiyet (bej_Latn),
 Bedjond (bjv_Latn),
@@ -885,7 +885,7 @@ Embu (ebu_Latn),
 Engenni (enn_Latn),
 Esan (ish_Latn),
 Etkywan (ich_Latn),
-Eton (Cameroon) (eto_Latn),
+Eton, Cameroon (eto_Latn),
 Etulo (utr_Latn),
 Ewe (ee_Latn),
 Ewondo (ewo_Latn),
@@ -906,7 +906,7 @@ Ga (gaa_Latn),
 Gamo (gmv_Latn),
 Ganda (lg_Latn),
 Gbari (gby_Latn),
-Gbaya (Sudan) (krs_Latn),
+Gbaya, Sudan (krs_Latn),
 Gbaya-Mbodomo (gmm_Latn),
 Gbe, Tofin (tfi_Latn),
 Gbe, Waci (wci_Latn),
@@ -1028,12 +1028,12 @@ Kutu (kdc_Latn),
 Kwanja (knp_Latn),
 Kwasio (nmg_Latn),
 Kwere (cwe_Latn),
-Lama (Togo) (las_Latn),
+Lama, Togo (las_Latn),
 Lamang (hia_Latn),
 Lamba (lam_Latn),
 Lamnso’ (lns_Latn),
 Langi (lag_Latn),
-Lango [Uganda] (laj_Latn),
+Lango, Uganda (laj_Latn),
 Lehar (cae_Latn),
 Lele (lln_Latn),
 Lendu (led_Latn),
@@ -1184,7 +1184,7 @@ Okiek (oki_Latn),
 Oromo (om_Latn),
 Otuho (lot_Latn),
 Paasaal (sig_Latn),
-Pana (Central African Republic) (pnz_Latn),
+Pana, Central African Republic (pnz_Latn),
 Pangu (png_Latn),
 Parkwa (pbi_Latn),
 Pero (pip_Latn),
@@ -1260,7 +1260,7 @@ Takwane (tke_Latn),
 Tal (tal_Latn),
 Talinga-Bwisi (tlj_Latn),
 Tamashek (tmh_Latn),
-Tamasheq, Latin (taq_Latn),
+Tamasheq (Latin) (taq_Latn),
 Tampulma (tpm_Latn),
 Tangale (tan_Latn),
 Tarok (yer_Latn),
@@ -1311,7 +1311,7 @@ Wan (wan_Latn),
 Wandala (mfi_Latn),
 Warji (wji_Latn),
 Winyé (kst_Latn),
-Wolaytta, Latin (wal_Latn),
+Wolaytta (Latin) (wal_Latn),
 Wolof (wo_Latn),
 Wè Northern (wob_Latn),
 Xaasongaxango (kao_Latn),
@@ -1327,6 +1327,7 @@ Yasa (yko_Latn),
 Yemba (ybb_Latn),
 Yom (pil_Latn),
 Yoruba (yo_Latn),
+Yoruba, Benin (yo_Latn_BJ),
 Zaghawa (zag_Latn),
 Zande (zne_Latn),
 Zarma (dje_Latn),

Lib/glyphsets/definitions/GF_Arabic_Plus.yaml

@@ -2,7 +2,7 @@ description: Covering additional less widely used languages (but not characters
   for historical or specialized texts)
 language_codes:
 - ckb_Arab
-- ms_Arab
+- zlm_Arab
 - ps_Arab
 - sd_Arab
 - ug_Arab

tests/test_glyphsets.py

@@ -18,7 +18,7 @@ def test_definitions():
     assert len(unicodes_per_glyphset("GF_Latin_Core")) == 319
 
     assert len(languages_per_glyphset("GF_Arabic_Plus")) == 5
-    assert len(languages_per_glyphset("GF_Latin_African")) == 601
+    assert len(languages_per_glyphset("GF_Latin_African")) == 602
 
     # accidental double definitions
     for code in defined_glyphsets():