Skip to content

Commit

Permalink
Merge pull request #11 from digling/Fixing-language-family
Browse files Browse the repository at this point in the history
Rerunning lexibank script to get the correct language family name
  • Loading branch information
LinguList authored May 3, 2024
2 parents 7a54e31 + b0c9c22 commit 2995840
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 57 deletions.
8 changes: 4 additions & 4 deletions cldf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ property | value
[dc:format](http://purl.org/dc/terms/format) | <ol><li>http://concepticon.clld.org/contributions/Serva-2020-207</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/digling/servamalagasy
[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/digling/servamalagasy/tree/741f9c2">digling/servamalagasy 741f9c2</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.7">Glottolog v4.7</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.16</li><li><strong>python-packages</strong>: <a href="./requirements.txt">requirements.txt</a></li></ol>
[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/digling/servamalagasy/tree/7a54e31">digling/servamalagasy v1.0-10-g7a54e31</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v5.0">Glottolog v5.0</a></li><li><a href="https://github.com/concepticon/concepticon-data/tree/v3.2.0">Concepticon v3.2.0</a></li><li><a href="https://github.com/cldf-clts/clts/tree/4468d3b">CLTS v2.2.0-16-g4468d3b</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) | servamalagasy
[rdf:type](http://www.w3.org/1999/02/22-rdf-syntax-ns#type) | http://www.w3.org/ns/dcat#Distribution

Expand Down Expand Up @@ -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` |
`FileName` | `string` |
`Number` | `string` |
Expand Down
12 changes: 6 additions & 6 deletions cldf/cldf-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
{
"rdf:about": "https://github.com/digling/servamalagasy",
"rdf:type": "prov:Entity",
"dc:created": "741f9c2",
"dc:created": "v1.0-10-g7a54e31",
"dc:title": "Repository"
},
{
"rdf:about": "https://github.com/glottolog/glottolog",
"rdf:type": "prov:Entity",
"dc:created": "v4.7",
"dc:created": "v5.0",
"dc:title": "Glottolog"
},
{
"rdf:about": "https://github.com/concepticon/concepticon-data",
"rdf:type": "prov:Entity",
"dc:created": "v3.1.0",
"dc:created": "v3.2.0",
"dc:title": "Concepticon"
},
{
"rdf:about": "https://github.com/cldf-clts/clts/",
"rdf:about": "https://github.com/cldf-clts/clts",
"rdf:type": "prov:Entity",
"dc:created": "v2.2.0",
"dc:created": "v2.2.0-16-g4468d3b",
"dc:title": "CLTS"
}
],
Expand All @@ -45,7 +45,7 @@
},
{
"dc:title": "python",
"dc:description": "3.9.16"
"dc:description": "3.9.6"
},
{
"dc:title": "python-packages",
Expand Down
4 changes: 2 additions & 2 deletions cldf/languages.csv
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ BetsimisarakaMananara,Betsimisaraka,nort2890,Northern Betsimisaraka Malagasy,bmm
TsimihetyMampikony,Tsimihety,tsim1257,Tsimihety Malagasy,xmw,Africa,-16.09,47.64,Austronesian,,40,Mampikony
TsimihetyAndapa,Tsimihety,tsim1257,Tsimihety Malagasy,xmw,Africa,-14.67,49.65,Austronesian,,41,Andapa
NosyBorahaAmbodifotatra,Nosy Boraha,nort2890,Northern Betsimisaraka Malagasy,bmm,Africa,-17,49.85,Austronesian,,42,Ambodifotatra
BaraBeroroha,Bara,bara1395,Bara,,Africa,-21.67,45.17,Unattested,,43,Beroroha
BaraBeroroha,Bara,bara1395,Bara,,Africa,-21.67,45.17,Afro-Asiatic,,43,Beroroha
SakalavaMiandrivazo,Sakalava,saka1291,West Malagasy Sakalava,skg,Africa,-19.56,45.45,Austronesian,,44,Miandrivazo
VezoMorondava,Vezo,vezo1235,Vezo,,Africa,-20.28,44.32,Austronesian,,45,Morondava
BaraIhosy,Bara,bara1395,Bara,,Africa,-22.4,46.12,Unattested,,46,Ihosy
BaraIhosy,Bara,bara1395,Bara,,Africa,-22.4,46.12,Afro-Asiatic,,46,Ihosy
TsimihetyAntsohihy,Tsimihety,tsim1257,Tsimihety Malagasy,xmw,Africa,-14.88,47.98,Austronesian,,47,Antsohihy
MerinaMaevatanana,Merina,meri1243,Merina,,Africa,-16.95,46.83,Austronesian,,48,Maevatanana
SakalavaBesalampy,Sakalava,saka1291,West Malagasy Sakalava,skg,Africa,-16.75,44.47,Austronesian,,49,Besalampy
Expand Down
4 changes: 2 additions & 2 deletions cldf/lingpy-rcParams.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
10,
10
],
"filename": "lingpy-2023-03-30",
"filename": "lingpy-2024-05-03",
"gap_symbol": "-",
"gap_weight": 0.5,
"gop": -2,
Expand Down Expand Up @@ -123,7 +123,7 @@
"scorer": {},
"sonar": true,
"stress": "\u02c8\u02cc'",
"timestamp": "2023-03-30 16:00",
"timestamp": "2024-05-03 17:59",
"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,
Expand Down
83 changes: 40 additions & 43 deletions cldf/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,59 +1,56 @@
appdirs==1.4.4
Babel==2.12.1
bs4==0.0.1
certifi==2022.12.7
cldfbench==1.13.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==1.1.0
clldutils==3.19.0
cldfzenodo==2.1.1
clldutils==3.22.2
colorama==0.4.6
colorlog==6.7.0
csvw==3.1.3
exceptiongroup==1.1.1
gitdb==4.0.10
greenlet==2.0.2
html5lib==1.1
idna==3.4
colorlog==6.8.2
csvw==3.3.0
exceptiongroup==1.2.1
gitdb==4.0.11
idna==3.7
iniconfig==2.0.0
isodate==0.6.1
jsonschema==4.17.3
lingpy==2.6.9
lxml==4.9.2
Markdown==3.4.3
nameparser==1.1.2
networkx==3.0
jsonschema==4.22.0
lingpy==2.6.13
lxml==5.2.1
Markdown==3.6
nameparser==1.1.3
networkx==3.2.1
newick==1.9.0
numpy==1.24.2
numpy==1.26.4
openpyxl==3.1.2
packaging==23.0
pluggy==1.0.0
purl==1.6
packaging==24.0
pluggy==1.5.0
pybtex==0.24.0
pycldf==1.34.1
pyclts==3.1.1
pyconcepticon==3.0.0
pycountry==22.3.5
pyglottolog==3.11.0
pycldf==1.38.0
pyclts==3.2.0
pyconcepticon==3.1.0
pycountry==23.12.11
pyglottolog==3.13.0
pylatexenc==2.10
pylexibank==3.4.0
pyrsistent==0.19.3
pytest==7.2.2
python-dateutil==2.8.2
rdflib==6.3.2
regex==2023.3.23
requests==2.28.2
pytest==8.2.0
python-dateutil==2.9.0.post0
rdflib==7.0.0
referencing==0.35.1
regex==2024.4.28
requests==2.31.0
rfc3986==1.5.0
segments==2.2.1
six==1.16.0
smmap==5.0.0
soupsieve==2.4
SQLAlchemy==2.0.7
smmap==5.0.1
soupsieve==2.5
SQLAlchemy==1.4.52
tabulate==0.9.0
termcolor==2.2.0
tqdm==4.65.0
typing_extensions==4.5.0
termcolor==2.4.0
tqdm==4.66.4
uritemplate==4.1.1
urllib3==1.26.15
webencodings==0.5.1
urllib3==2.2.1
xlrd==2.0.1
zenodoclient==0.5.0
zenodoclient==0.5.1

0 comments on commit 2995840

Please sign in to comment.