Fixing glottocode

.github/workflows/cldf-validation.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6]
+        python-version: [3.9]
 
     steps:
     - uses: actions/checkout@v2

README.md

@@ -1,6 +1,6 @@
 # CLDF dataset derived from Z'graggen's "Madang Comparative Wordlists" from 1980
 
-[![CLDF validation](https://github.com/lexibank/zgraggenmadang/workflows/CLDF-validation/badge.svg)](https://github.com/lexibank/zgraggenmadang/actions?query=workflow%3ACLDF-validation)
+[![CLDF validation](https://github.com/MuffinLinwist/zgraggenmadang/workflows/CLDF-validation/badge.svg)](https://github.com/MuffinLinwist/zgraggenmadang/actions?query=workflow%3ACLDF-validation)
 
 ## How to cite
 
@@ -20,7 +20,7 @@ Conceptlists in Concepticon:
 ## Statistics
 
 
-[![CLDF validation](https://github.com/lexibank/zgraggenmadang/workflows/CLDF-validation/badge.svg)](https://github.com/lexibank/zgraggenmadang/actions?query=workflow%3ACLDF-validation)
+[![CLDF validation](https://github.com/MuffinLinwist/zgraggenmadang/workflows/CLDF-validation/badge.svg)](https://github.com/MuffinLinwist/zgraggenmadang/actions?query=workflow%3ACLDF-validation)
 ![Glottolog: 100%](https://img.shields.io/badge/Glottolog-100%25-brightgreen.svg "Glottolog: 100%")
 ![Concepticon: 95%](https://img.shields.io/badge/Concepticon-95%25-green.svg "Concepticon: 95%")
 ![Source: 100%](https://img.shields.io/badge/Source-100%25-brightgreen.svg "Source: 100%")
@@ -34,7 +34,7 @@ Conceptlists in Concepticon:
 - **Synonymy:** 1.12
 - **Invalid lexemes:** 0
 - **Tokens:** 153,754
-- **Segments:** 150 (0 BIPA errors, 0 CTLS sound class errors, 150 CLTS modified)
+- **Segments:** 150 (0 BIPA errors, 0 CLTS sound class errors, 150 CLTS modified)
 - **Inventory size (avg):** 39.76
 
 # Contributors

cldf/README.md

@@ -12,8 +12,8 @@ property | value
 [dc:conformsTo](http://purl.org/dc/terms/conformsTo) | [CLDF Wordlist](http://cldf.clld.org/v1.0/terms.rdf#Wordlist)
 [dc:format](http://purl.org/dc/terms/format) | <ol><li>http://concepticon.clld.org/contributions/Zgraggen-1980-380</li></ol>
 [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/lexibank/zgraggenmadang
-[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/lexibank/zgraggenmadang/tree/9fad738">lexibank/zgraggenmadang v4.0-2-g9fad738</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.4">Glottolog v4.4</a></li><li><a href="https://github.com/concepticon/concepticon-data/tree/v2.5.0">Concepticon v2.5.0</a></li><li><a href="https://github.com/cldf-clts/clts/tree/v2.1.0">CLTS v2.1.0</a></li></ol>
+[dcat:accessURL](http://www.w3.org/ns/dcat#accessURL) | https://github.com/MuffinLinwist/zgraggenmadang
+[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/MuffinLinwist/zgraggenmadang/tree/90f536d">MuffinLinwist/zgraggenmadang 90f536d</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.8">Glottolog v4.8</a></li><li><a href="https://github.com/concepticon/concepticon-data/tree/v3.1.0">Concepticon v3.1.0</a></li><li><a href="https://github.com/cldf-clts/clts/tree/v2.2.0">CLTS v2.2.0</a></li></ol>
 [prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) | <ol><li><strong>lingpy-rcParams</strong>: <a href="./lingpy-rcParams.json">lingpy-rcParams.json</a></li><li><strong>python</strong>: 3.9.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) | zgraggenmadang
 [rdf:type](http://www.w3.org/1999/02/22-rdf-syntax-ns#type) | http://www.w3.org/ns/dcat#Distribution
@@ -72,8 +72,8 @@ Name/Property | Datatype | Description
 `Glottolog_Name` | `string` | 
 [ISO639P3code](http://cldf.clld.org/v1.0/terms.rdf#iso639P3code) | `string` | 
 [Macroarea](http://cldf.clld.org/v1.0/terms.rdf#macroarea) | `string` | 
-[Latitude](http://cldf.clld.org/v1.0/terms.rdf#latitude) | `decimal` | 
-[Longitude](http://cldf.clld.org/v1.0/terms.rdf#longitude) | `decimal` | 
+[Latitude](http://cldf.clld.org/v1.0/terms.rdf#latitude) | `decimal`<br>&ge; -90<br>&le; 90 | 
+[Longitude](http://cldf.clld.org/v1.0/terms.rdf#longitude) | `decimal`<br>&ge; -180<br>&le; 180 | 
 `Family` | `string` | 
 `Source` | `string` | 
 

cldf/cldf-metadata.json

@@ -11,30 +11,30 @@
     "dc:related": null,
     "dc:source": "sources.bib",
     "dc:title": "CLDF dataset derived from Z'graggen's \"Madang Comparative Wordlists\" from 1980",
-    "dcat:accessURL": "https://github.com/lexibank/zgraggenmadang",
+    "dcat:accessURL": "https://github.com/MuffinLinwist/zgraggenmadang",
     "prov:wasDerivedFrom": [
         {
-            "rdf:about": "https://github.com/lexibank/zgraggenmadang",
+            "rdf:about": "https://github.com/MuffinLinwist/zgraggenmadang",
             "rdf:type": "prov:Entity",
-            "dc:created": "v4.0-2-g9fad738",
+            "dc:created": "90f536d",
             "dc:title": "Repository"
         },
         {
             "rdf:about": "https://github.com/glottolog/glottolog",
             "rdf:type": "prov:Entity",
-            "dc:created": "v4.4",
+            "dc:created": "v4.8",
             "dc:title": "Glottolog"
         },
         {
             "rdf:about": "https://github.com/concepticon/concepticon-data",
             "rdf:type": "prov:Entity",
-            "dc:created": "v2.5.0",
+            "dc:created": "v3.1.0",
             "dc:title": "Concepticon"
         },
         {
             "rdf:about": "https://github.com/cldf-clts/clts",
             "rdf:type": "prov:Entity",
-            "dc:created": "v2.1.0",
+            "dc:created": "v2.2.0",
             "dc:title": "CLTS"
         }
     ],
@@ -54,9 +54,6 @@
     ],
     "rdf:ID": "zgraggenmadang",
     "rdf:type": "http://www.w3.org/ns/dcat#Distribution",
-    "dialect": {
-        "commentPrefix": null
-    },
     "tables": [
         {
             "dc:conformsTo": "http://cldf.clld.org/v1.0/terms.rdf#FormTable",
@@ -180,7 +177,7 @@
                     {
                         "datatype": "string",
                         "propertyUrl": "http://cldf.clld.org/v1.0/terms.rdf#glottocode",
-                        "valueUrl": "http://glottolog.org/resource/languoid/id/{glottolog_id}",
+                        "valueUrl": "http://glottolog.org/resource/languoid/id/{Glottocode}",
                         "name": "Glottocode"
                     },
                     {
@@ -250,7 +247,7 @@
                     {
                         "datatype": "string",
                         "propertyUrl": "http://cldf.clld.org/v1.0/terms.rdf#concepticonReference",
-                        "valueUrl": "http://concepticon.clld.org/parameters/{concepticon_id}",
+                        "valueUrl": "http://concepticon.clld.org/parameters/{Concepticon_ID}",
                         "name": "Concepticon_ID"
                     },
                     {

cldf/languages.csv

@@ -36,7 +36,7 @@ korak,korak,kora1296,Korak,koz,Papunesia,-4.5998,145.514,Nuclear Trans New Guine
 kowaki,kowaki,kowa1245,Kowaki,xow,Papunesia,-4.63032,145.412,Nuclear Trans New Guinea,Zgraggen1980NA
 lemio,lemio,lemi1243,Lemio,lei,Papunesia,-5.61407,146.441,Nuclear Trans New Guinea,Zgraggen1980RC
 maia-pila,maia-pila,pila1246,Pila,,Papunesia,,,Nuclear Trans New Guinea,Zgraggen1980NA
-maia-saki,maia-saki,sali1249,Saki,,,,,,Zgraggen1980NA
+maia-saki,maia-saki,saki1249,Saki,,Papunesia,,,Nuclear Trans New Guinea,Zgraggen1980NA
 mala,mala,mala1494,Mala (Papua New Guinea),ped,Papunesia,-4.35889,145.04,Nuclear Trans New Guinea,Zgraggen1980MA
 malas,malas,mala1495,Malas,mkr,Papunesia,-4.76685,145.621,Nuclear Trans New Guinea,Zgraggen1980NA
 male,male,male1291,Male (Papua New Guinea),mdc,Papunesia,-5.49975,145.757,Nuclear Trans New Guinea,Zgraggen1980RC

cldf/lingpy-rcParams.json

@@ -64,7 +64,7 @@
         10,
         10
     ],
-    "filename": "lingpy-2021-11-07",
+    "filename": "lingpy-2024-02-26",
     "gap_symbol": "-",
     "gap_weight": 0.5,
     "gop": -2,
@@ -123,7 +123,7 @@
     "scorer": {},
     "sonar": true,
     "stress": "\u02c8\u02cc'",
-    "timestamp": "2021-11-07 19:55",
+    "timestamp": "2024-02-26 16:10",
     "tones": "\u00b9\u00b2\u00b3\u2074\u2075\u2076\u2077\u2078\u2079\u2070\u2081\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089\u20800123456789\u02e5\u02e6\u02e7\u02e8\u02e9\u02ea\u02eb-\ua708-\ua709-\ua70a-\ua70b-\ua70c-\ua70d-\ua70e-\ua70f-\ua710-\ua711-\ua712-\ua713-\ua714-\ua715-\ua716-\ua717-\ua718-\ua719-\ua71a-\ua700-\ua701-\ua702-\ua703-\ua704-\ua705-\ua706-\ua707",
     "tree_calc": "neighbor",
     "unique_sequences": true,

cldf/parameters.csv

@@ -281,7 +281,7 @@ ID,Name,Concepticon_ID,Concepticon_Gloss
 365_take,take,1749,TAKE
 366a_tie,tie,1917,TIE
 366b_fasten,fasten,1094,FASTEN
-367_callout,call out,,
+367_callout,call out,715,SHOUT
 368_cry,cry,1839,CRY
 369_laugh,laugh,1355,LAUGH
 370a_singsing,singsing,131,FESTIVAL

cldf/requirements.txt

@@ -1,47 +1,57 @@
 appdirs==1.4.4
-bs4==0.0.1
-certifi==2021.10.8
-cldfbench==1.8.0
-cldfcatalog==1.3.2
-clldutils==3.10.0
-colorlog==6.5.0
-csvw==1.11.0
-gitdb==4.0.9
-greenlet==1.1.2
-idna==3.3
-iniconfig==1.1.1
-isodate==0.6.0
-lingpy==2.6.8
-Markdown==3.3.4
-networkx==2.6.3
-newick==1.3.1
-numpy==1.21.3
-openpyxl==3.0.9
-packaging==21.2
-pluggy==1.0.0
+attrs==23.2.0
+Babel==2.14.0
+bibtexparser==2.0.0b7
+bs4==0.0.2
+certifi==2024.2.2
+cldfbench==1.14.0
+cldfcatalog==1.5.1
+cldfzenodo==2.1.0
+clldutils==3.22.1
+colorama==0.4.6
+colorlog==6.8.2
+csvw==3.3.0
+exceptiongroup==1.2.0
+gitdb==4.0.11
+idna==3.6
+iniconfig==2.0.0
+isodate==0.6.1
+jsonschema==4.21.1
+lingpy==2.6.13
+lxml==5.1.0
+Markdown==3.5.2
+nameparser==1.1.3
+networkx==3.2.1
+newick==1.9.0
+numpy==1.26.4
+openpyxl==3.1.2
+packaging==23.2
+pluggy==1.4.0
 purl==1.6
-py==1.10.0
 pybtex==0.24.0
-pycldf==1.23.0
+pycldf==1.37.0
 pyclts==3.1.1
-pyconcepticon==2.8.0
-pycountry==20.7.3
-pyglottolog==3.6.0
-pylexibank==3.3.0
-pytest==6.2.5
+pyconcepticon==3.0.0
+pycountry==23.12.11
+pyglottolog==3.12.0
+pylatexenc==2.10
+pylexibank==3.4.0
+pytest==8.0.2
 python-dateutil==2.8.2
-regex==2021.11.1
-requests==2.26.0
+rdflib==7.0.0
+referencing==0.33.0
+regex==2023.12.25
+requests==2.31.0
 rfc3986==1.5.0
-segments==2.2.0
+segments==2.2.1
 six==1.16.0
-smmap==5.0.0
-soupsieve==2.2.1
-SQLAlchemy==1.4.26
-tabulate==0.8.9
-termcolor==1.1.0
-tqdm==4.62.3
+smmap==5.0.1
+soupsieve==2.5
+SQLAlchemy==1.4.51
+tabulate==0.9.0
+termcolor==2.4.0
+tqdm==4.66.2
 uritemplate==4.1.1
-urllib3==1.26.7
+urllib3==2.2.1
 xlrd==2.0.1
-zenodoclient==0.4.1
+zenodoclient==0.5.1

etc/languages.csv

@@ -36,7 +36,7 @@ ID,Name,Glottocode,Glottolog_Name,Source
 34,kowaki,kowa1245,Kowaki,Zgraggen1980NA
 35,lemio,lemi1243,Lemio,Zgraggen1980RC
 36,maia-pila,pila1246,Pila,Zgraggen1980NA
-37,maia-saki,sali1249,Saki,Zgraggen1980NA
+37,maia-saki,saki1249,Saki,Zgraggen1980NA
 38,mala,mala1494,Mala (Papua New Guinea),Zgraggen1980MA
 39,malas,mala1495,Malas,Zgraggen1980NA
 40,male,male1291,Male (Papua New Guinea),Zgraggen1980RC