diff --git a/.github/workflows/cldf-validation.yml b/.github/workflows/cldf-validation.yml index 48ab092..b2f938e 100644 --- a/.github/workflows/cldf-validation.yml +++ b/.github/workflows/cldf-validation.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.9] + python-version: [3.12] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index d0f13b7..c3daa0f 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ Conceptlists in Concepticon: ![BIPA: 100%](https://img.shields.io/badge/BIPA-100%25-brightgreen.svg "BIPA: 100%") ![CLTS SoundClass: 100%](https://img.shields.io/badge/CLTS%20SoundClass-100%25-brightgreen.svg "CLTS SoundClass: 100%") -- **Varieties:** 10 -- **Concepts:** 300 +- **Varieties:** 10 (linked to 10 different Glottocodes) +- **Concepts:** 300 (linked to 285 different Concepticon concept sets) - **Lexemes:** 2,998 - **Sources:** 1 - **Synonymy:** 1.00 diff --git a/cldf/README.md b/cldf/README.md index b5f79f0..9f84c63 100644 --- a/cldf/README.md +++ b/cldf/README.md @@ -13,8 +13,8 @@ property | value [dc:format](http://purl.org/dc/terms/format) |
  1. http://concepticon.clld.org/contributions/Othaniel-2017-300
[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/othanieljen -[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) |
  1. lexibank/othanieljen 85404fa
  2. Glottolog v4.8
  3. Concepticon v3.1.0
  4. CLTS v2.2.0
-[prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) |
  1. lingpy-rcParams: lingpy-rcParams.json
  2. python: 3.10.12
  3. python-packages: requirements.txt
+[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) |
  1. lexibank/othanieljen v1.0
  2. Glottolog v5.0
  3. Concepticon v3.2.0
  4. CLTS v2.3.0
+[prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) |
  1. lingpy-rcParams: lingpy-rcParams.json
  2. python: 3.12.4
  3. python-packages: requirements.txt
[rdf:ID](http://www.w3.org/1999/02/22-rdf-syntax-ns#ID) | othanieljen [rdf:type](http://www.w3.org/1999/02/22-rdf-syntax-ns#type) | http://www.w3.org/ns/dcat#Distribution diff --git a/cldf/cldf-metadata.json b/cldf/cldf-metadata.json index 767b1e6..855b885 100644 --- a/cldf/cldf-metadata.json +++ b/cldf/cldf-metadata.json @@ -16,25 +16,25 @@ { "rdf:about": "https://github.com/lexibank/othanieljen", "rdf:type": "prov:Entity", - "dc:created": "85404fa", + "dc:created": "v1.0", "dc:title": "Repository" }, { "rdf:about": "https://github.com/glottolog/glottolog", "rdf:type": "prov:Entity", - "dc:created": "v4.8", + "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:type": "prov:Entity", - "dc:created": "v2.2.0", + "dc:created": "v2.3.0", "dc:title": "CLTS" } ], @@ -45,7 +45,7 @@ }, { "dc:title": "python", - "dc:description": "3.10.12" + "dc:description": "3.12.4" }, { "dc:title": "python-packages", diff --git a/cldf/lingpy-rcParams.json b/cldf/lingpy-rcParams.json index 628a6ca..9a6aa6f 100644 --- a/cldf/lingpy-rcParams.json +++ b/cldf/lingpy-rcParams.json @@ -64,7 +64,7 @@ 10, 10 ], - "filename": "lingpy-2023-12-19", + "filename": "lingpy-2024-08-01", "gap_symbol": "-", "gap_weight": 0.5, "gop": -2, @@ -123,7 +123,7 @@ "scorer": {}, "sonar": true, "stress": "\u02c8\u02cc'", - "timestamp": "2023-12-19 08:30", + "timestamp": "2024-08-01 09:04", "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, diff --git a/cldf/requirements.txt b/cldf/requirements.txt index 5462aac..19ecbc1 100644 --- a/cldf/requirements.txt +++ b/cldf/requirements.txt @@ -1,58 +1,56 @@ appdirs==1.4.4 -attrs==23.1.0 -Babel==2.14.0 -bibtexparser==2.0.0b4 -bs4==0.0.1 -certifi==2023.11.17 +attrs==23.2.0 +Babel==2.15.0 +bibtexparser==2.0.0b7 +bs4==0.0.2 +certifi==2024.7.4 cldfbench==1.14.0 cldfcatalog==1.5.1 -cldfzenodo==2.1.0 -clldutils==3.22.1 +cldfzenodo==2.1.1 +clldutils==3.22.2 colorama==0.4.6 -colorlog==6.8.0 -csvw==3.2.1 -exceptiongroup==1.2.0 +colorlog==6.8.2 +csvw==3.3.0 gitdb==4.0.11 -greenlet==3.0.2 -idna==3.6 +greenlet==3.0.3 +idna==3.7 iniconfig==2.0.0 isodate==0.6.1 -jsonschema==4.20.0 +jsonschema==4.23.0 lingpy==2.6.13 -lxml==4.9.3 -Markdown==3.5.1 +lxml==5.2.2 +Markdown==3.6 nameparser==1.1.3 -networkx==3.2.1 +networkx==3.3 newick==1.9.0 -numpy==1.26.2 -openpyxl==3.1.2 -packaging==23.2 -pluggy==1.3.0 -purl==1.6 +numpy==2.0.1 +openpyxl==3.1.5 +packaging==24.1 +pluggy==1.5.0 pybtex==0.24.0 -pycldf==1.36.0 -pyclts==3.1.1 -pyconcepticon==3.0.0 -pycountry==23.12.11 -pyglottolog==3.12.0 +pycldf==1.38.1 +pyclts==3.2.0 +pyconcepticon==3.1.0 +pycountry==24.6.1 +pyglottolog==3.13.0 pylatexenc==2.10 -pylexibank==3.4.0 -pytest==7.4.3 -python-dateutil==2.8.2 +pylexibank==3.5.0 +pytest==8.3.2 +python-dateutil==2.9.0.post0 rdflib==7.0.0 -referencing==0.32.0 -regex==2023.10.3 -requests==2.31.0 +referencing==0.35.1 +regex==2024.7.24 +requests==2.32.3 rfc3986==1.5.0 segments==2.2.1 six==1.16.0 smmap==5.0.1 soupsieve==2.5 -SQLAlchemy==1.4.50 +SQLAlchemy==1.4.53 tabulate==0.9.0 termcolor==2.4.0 -tqdm==4.66.1 +tqdm==4.66.4 uritemplate==4.1.1 -urllib3==2.1.0 +urllib3==2.2.2 xlrd==2.0.1 zenodoclient==0.5.1 \ No newline at end of file diff --git a/etc/orthography.tsv b/etc/orthography.tsv index b3d2f91..c66632a 100644 --- a/etc/orthography.tsv +++ b/etc/orthography.tsv @@ -42,7 +42,6 @@ ow ou hw hʷ Ɂd ˀd ^*k-hneᴬ k Ø/ə + hn/n̥ e ᴬ/⁵⁵ -kw kʷ s s 70 U+0073 ʃ ʃ 70 U+0283 é é/e 65 U+00e9 @@ -255,7 +254,6 @@ u᷇ u᷇/u 1 U+0075 U+1dc7 ǔː ǔː/uː 1 U+01d4 U+02d0 ʒw ʒʷ 1 U+0292 U+0077 ɲ̩̀̀ɲ ɲ̩̀̀/ɲ̍ ɲ -a̤᷇ a̤᷇/a ŋ̩̀̀g ŋ̩̀̀/ŋ̍ g ^ŋ̩̀̀g ŋ̩̀̀/ŋ̍ g mùŋ̩́ m ù/u ŋ @@ -272,7 +270,6 @@ zə̀ŋ) z ə̀/ə ŋ 1 U+007a U+0259 U+0300 U+014b U+0029 ɨ̀̀ ɨ̀/ɨ 1 U+0268 U+0300 U+0300 ɡ g 1 U+0261 ɔ᷇ ɔ᷇/ɔ 1 U+0254 U+1dc7 -hw hʷ 1 U+0068 U+0077 ìw ì/i w 1 U+00ec U+0077 īsw ī/i sʷ 1 U+012b U+0073 U+0077 o᷇ o᷇/o 1 U+006f U+1dc7 diff --git a/lexibank_othanieljen.py b/lexibank_othanieljen.py index f338816..98bb1b7 100644 --- a/lexibank_othanieljen.py +++ b/lexibank_othanieljen.py @@ -8,9 +8,10 @@ class Dataset(pylexibank.Dataset): id = "othanieljen" form_spec = pylexibank.FormSpec( - brackets={"(": ")"}, missing_data=("", " ", "-"), + brackets={"(": ")"}, + missing_data=("", " ", "-"), replacements=[("ɗɨ̀ŋvi ̀", "ɗɨ̀ŋvi"), (" ", "_")], - strip_inside_brackets=True + strip_inside_brackets=True, ) def cmd_makecldf(self, args): diff --git a/setup.cfg b/setup.cfg index af8d76a..f9d596a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,4 @@ [tool:pytest] testpaths = test.py -mock_use_standalone_module = true addopts = --cldf-metadata=cldf/cldf-metadata.json