more Glottolog mappings

cldf-datasets · May 9, 2023 · fceed2a · fceed2a
1 parent 3744f5a
commit fceed2a
Show file tree

Hide file tree

Showing 10 changed files with 878 additions and 800 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -183,5 +183,16 @@
             "name": "Robert Forkel",
             "type": "DataCurator"
         }
+    ],
+    "creators": [
+        {
+            "name": "Lyle Campbell"
+        },
+        {
+            "name": "Gary Holton"
+        },
+        {
+            "name": "Anna Belew"
+        }
     ]
 }
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -4,9 +4,9 @@ See https://endangeredlanguages.com/about_catalogue/ for a detailed description
 
 Name | Role
 --- | ---
-Lyle Campbell | Editor, DataCollector, Researcher
-Gary Holton | ProjectManager, Editor
-Anna Belew | Editor, ProjectManager
+Lyle Campbell | Editor, DataCollector, Researcher, author
+Gary Holton | ProjectManager, Editor, author
+Anna Belew | Editor, ProjectManager, author
 Sean Simpson | DataCollector
 John Van Way | DataCollector
 Amy Brunett | DataCollector

diff --git a/cldf/README.md b/cldf/README.md
@@ -13,7 +13,7 @@ property | value
 [dc:identifier](http://purl.org/dc/terms/identifier) | https://endangeredlanguages.com
 [dc:license](http://purl.org/dc/terms/license) | https://creativecommons.org/licenses/by/4.0/
 [dcat:accessURL](http://www.w3.org/ns/dcat#accessURL) | https://github.com/cldf-datasets/elcat
-[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/cldf-datasets/elcat/tree/06b63ae">cldf-datasets/elcat 06b63ae</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.7">Glottolog v4.7</a></li></ol>
+[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/cldf-datasets/elcat/tree/v2023">cldf-datasets/elcat v2023</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.7">Glottolog v4.7</a></li></ol>
 [prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) | <ol><li><strong>python</strong>: 3.10.6</li><li><strong>python-packages</strong>: <a href="./requirements.txt">requirements.txt</a></li></ol>
 [rdf:ID](http://www.w3.org/1999/02/22-rdf-syntax-ns#ID) | elcat
 [rdf:type](http://www.w3.org/1999/02/22-rdf-syntax-ns#type) | http://www.w3.org/ns/dcat#Distribution

diff --git a/cldf/StructureDataset-metadata.json b/cldf/StructureDataset-metadata.json
@@ -16,7 +16,7 @@
         {
             "rdf:about": "https://github.com/cldf-datasets/elcat",
             "rdf:type": "prov:Entity",
-            "dc:created": "06b63ae",
+            "dc:created": "v2023",
             "dc:title": "Repository"
         },
         {

diff --git a/cldf/languages.csv b/cldf/languages.csv
diff --git a/cldf/requirements.txt b/cldf/requirements.txt
@@ -5,7 +5,7 @@ bs4==0.0.1
 Cartopy==0.21.1
 certifi==2022.12.7
 cldfbench==1.13.0
--e git+https://github.com/cldf-datasets/elcat@06b63ae0432ba08b92f12ef810e536ffef2b16e2#egg=cldfbench_elcat
+-e git+https://github.com/cldf-datasets/elcat@3744f5a3f604b3f24638c93e1182ac7fd4d1452a#egg=cldfbench_elcat
 cldfcatalog==1.5.1
 cldfviz==0.12.0
 cldfzenodo==1.1.0

diff --git a/cldf/values.csv b/cldf/values.csv
diff --git a/cldfbench_elcat.py b/cldfbench_elcat.py
@@ -127,7 +127,8 @@ def cmd_makecldf(self, args):
             if lang.id in id2gc:  # Hand-curated mapping exists.
                 if glottocodes:
                     if [id2gc[lang.id]] != glottocodes:
-                        assert lang.id == '2896'  # This is the only known discrepancy.
+                        #print(id2gc[lang.id], glottocodes)
+                        assert (lang.id in {'2896', '6029'}) or id2gc[lang.id] in glottocodes, str(lang.id)  # This is the only known discrepancy.
                         glottocodes = [id2gc[lang.id]]
                 else:
                     glottocodes = [id2gc[lang.id]]