diff --git a/.github/workflows/cldf-validation.yml b/.github/workflows/cldf-validation.yml index 62c167f..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.6] + python-version: [3.12] steps: - uses: actions/checkout@v2 diff --git a/.zenodo.json b/.zenodo.json index 11ac811..815617a 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -43,7 +43,7 @@ }, { "name": "Johann-Mattis List", - "type": "Other" + "type": "Editor" } ], "communities": [ diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 5e99781..63b42ed 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -5,4 +5,4 @@ Name | GitHub user | Description | Role Liú Lìlǐ | | data collector | DataCollector, Editor, Author Wáng Hóngzhōng | | data collector | DataCollector, Editor, Author Bǎi Yíng | | data collector | DataCollector, Editor, Author -Johann-Mattis List | @LinguList | maintainer | Other +Johann-Mattis List | @LinguList | maintainer | Editor diff --git a/README.md b/README.md index 08aa347..3719a94 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:** 19 -- **Concepts:** 203 +- **Varieties:** 19 (linked to 19 different Glottocodes) +- **Concepts:** 203 (linked to 202 different Concepticon concept sets) - **Lexemes:** 4,302 - **Sources:** 1 - **Synonymy:** 1.12 @@ -46,7 +46,7 @@ Name | GitHub user | Description | Role Liú Lìlǐ | | data collector | DataCollector, Editor, Author Wáng Hóngzhōng | | data collector | DataCollector, Editor, Author Bǎi Yíng | | data collector | DataCollector, Editor, Author -Johann-Mattis List | @LinguList | maintainer | Other +Johann-Mattis List | @LinguList | maintainer | Editor diff --git a/cldf/README.md b/cldf/README.md index 10f084a..09e4af1 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/Liu-2007-201
[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/liusinitic -[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) |
  1. lexibank/liusinitic 480e129
  2. Glottolog v4.6
  3. Concepticon v3.0.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.4
  3. python-packages: requirements.txt
+[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) |
  1. lexibank/liusinitic v1.3-3-g5729ca7
  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.9.6
  3. python-packages: requirements.txt
[rdf:ID](http://www.w3.org/1999/02/22-rdf-syntax-ns#ID) | liusinitic [rdf:type](http://www.w3.org/1999/02/22-rdf-syntax-ns#type) | http://www.w3.org/ns/dcat#Distribution @@ -66,8 +66,8 @@ Name/Property | Datatype | Description [Glottocode](http://cldf.clld.org/v1.0/terms.rdf#glottocode) | `string` | `Glottolog_Name` | `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`
≥ -90
≤ 90 | +[Longitude](http://cldf.clld.org/v1.0/terms.rdf#longitude) | `decimal`
≥ -180
≤ 180 | `Family` | `string` | `ChineseName` | `string` | `SubGroup` | `string` | diff --git a/cldf/cldf-metadata.json b/cldf/cldf-metadata.json index 9a2a31e..0e9f620 100644 --- a/cldf/cldf-metadata.json +++ b/cldf/cldf-metadata.json @@ -16,25 +16,25 @@ { "rdf:about": "https://github.com/lexibank/liusinitic", "rdf:type": "prov:Entity", - "dc:created": "480e129", + "dc:created": "v1.3-3-g5729ca7", "dc:title": "Repository" }, { "rdf:about": "https://github.com/glottolog/glottolog", "rdf:type": "prov:Entity", - "dc:created": "v4.6", + "dc:created": "v5.0", "dc:title": "Glottolog" }, { "rdf:about": "https://github.com/concepticon/concepticon-data", "rdf:type": "prov:Entity", - "dc:created": "v3.0.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.3.0", "dc:title": "CLTS" } ], @@ -45,7 +45,7 @@ }, { "dc:title": "python", - "dc:description": "3.10.4" + "dc:description": "3.9.6" }, { "dc:title": "python-packages", diff --git a/cldf/lingpy-rcParams.json b/cldf/lingpy-rcParams.json index 26e4ee4..7d44721 100644 --- a/cldf/lingpy-rcParams.json +++ b/cldf/lingpy-rcParams.json @@ -64,7 +64,7 @@ 10, 10 ], - "filename": "lingpy-2022-11-11", + "filename": "lingpy-2024-08-05", "gap_symbol": "-", "gap_weight": 0.5, "gop": -2, @@ -123,7 +123,7 @@ "scorer": {}, "sonar": true, "stress": "\u02c8\u02cc'", - "timestamp": "2022-11-11 20:50", + "timestamp": "2024-08-05 11:52", "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 ff3be26..7ea1c7f 100644 --- a/cldf/requirements.txt +++ b/cldf/requirements.txt @@ -1,59 +1,56 @@ appdirs==1.4.4 -Babel==2.11.0 -bs4==0.0.1 -certifi==2022.9.24 -cldfbench==1.13.0 +attrs==24.1.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==0.3.0 -clldutils==3.13.0 +cldfzenodo==2.1.1 +clldutils==3.22.2 colorama==0.4.6 -colorlog==6.7.0 -csvw==3.1.3 -exceptiongroup==1.0.1 -gitdb==4.0.9 -greenlet==2.0.1 -html5lib==1.1 -idna==3.4 -iniconfig==1.1.1 +colorlog==6.8.2 +csvw==3.3.0 +exceptiongroup==1.2.2 +gitdb==4.0.11 +idna==3.7 +iniconfig==2.0.0 isodate==0.6.1 -jsonschema==4.17.0 -lingpy==2.6.9 -lxml==4.9.1 -Markdown==3.4.1 -nameparser==1.1.1 -networkx==2.8.8 -newick==1.3.2 -numpy==1.23.4 -openpyxl==3.0.10 -packaging==21.3 -pluggy==1.0.0 -purl==1.6 +jsonschema==4.23.0 +lingpy==2.6.13 +lxml==5.2.2 +Markdown==3.6 +nameparser==1.1.3 +networkx==3.2.1 +newick==1.9.0 +numpy==2.0.1 +openpyxl==3.1.5 +packaging==24.1 +pluggy==1.5.0 pybtex==0.24.0 -pycldf==1.29.0 -pyclts==3.1.1 -pyconcepticon==3.0.0 -pycountry==22.3.5 -pyglottolog==3.10.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 -pyrsistent==0.19.2 -pytest==7.2.0 -python-dateutil==2.8.2 -pytz==2022.6 -rdflib==6.2.0 -regex==2022.10.31 -requests==2.28.1 +pylexibank==3.5.0 +pytest==8.3.2 +python-dateutil==2.9.0.post0 +rdflib==7.0.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.0 -soupsieve==2.3.2.post1 -SQLAlchemy==1.4.43 +smmap==5.0.1 +soupsieve==2.5 +SQLAlchemy==1.4.53 tabulate==0.9.0 -termcolor==2.1.0 -tqdm==4.64.1 +termcolor==2.4.0 +tqdm==4.66.5 uritemplate==4.1.1 -urllib3==1.26.12 -webencodings==0.5.1 +urllib3==2.2.2 xlrd==2.0.1 -zenodoclient==0.4.1 \ No newline at end of file +zenodoclient==0.5.1 \ No newline at end of file diff --git a/cldf/sources.bib b/cldf/sources.bib index afbe215..d6e05ff 100644 --- a/cldf/sources.bib +++ b/cldf/sources.bib @@ -1,5 +1,5 @@ @book{Liu2007, - author = {刘俐李, Liú Lìlǐ and 王洪钟, Wáng Hóngzhōng and 柏莹, Bǎi Yíng}, + author = {Liú, Lìlǐ 刘俐李 and Wáng, Hóngzhōng 王洪钟 and Bǎi, Yíng 柏莹}, address = {Nánjīng 南京}, owner = {mattis}, publisher = {Fènghuáng 凤凰}, diff --git a/lexibank_liusinitic.py b/lexibank_liusinitic.py index b49fc82..30f0038 100644 --- a/lexibank_liusinitic.py +++ b/lexibank_liusinitic.py @@ -69,6 +69,7 @@ class Dataset(pylexibank.Dataset): lexeme_class = CustomLexeme cognate_class = CustomCognate cross_concept_cognates = True + writer_options = dict(keep_languages=False, keep_parameters=False) def cmd_download(self, args): print("updating ...") diff --git a/raw/sources.bib b/raw/sources.bib index 96e1308..64c2015 100644 --- a/raw/sources.bib +++ b/raw/sources.bib @@ -1,5 +1,5 @@ @Book{Liu2007, - author = {Liú Lìlǐ 刘俐李 and Wáng Hóngzhōng 王洪钟 and Bǎi Yíng 柏莹}, + author = {Liú, Lìlǐ 刘俐李 and Wáng, Hóngzhōng 王洪钟 and Bǎi, Yíng 柏莹}, year = {2007}, publisher = {Fènghuáng 凤凰}, address = {Nánjīng 南京},