From 13d369ce58955e326fd5c98b57070816ac07db8c Mon Sep 17 00:00:00 2001 From: chrzyki Date: Thu, 1 Aug 2024 11:21:32 +0200 Subject: [PATCH] Prepare release --- .github/workflows/cldf-validation.yml | 2 +- .zenodo.json | 2 +- CONTRIBUTORS.md | 5 +- README.md | 11 ++-- cldf/README.md | 8 +-- cldf/cldf-metadata.json | 17 ++--- cldf/lingpy-rcParams.json | 4 +- cldf/parameters.csv | 4 +- cldf/requirements.txt | 94 +++++++++++++++------------ lexibank_yanglalo.py | 2 + 10 files changed, 77 insertions(+), 72 deletions(-) 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 09b4e18..220847e 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -25,7 +25,7 @@ }, { "name": "Johann-Mattis List", - "type": "Other" + "type": "Editor" } ], "communities": [ diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d78bf8f..3f1d249 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -4,7 +4,6 @@ Name | GitHub user | Description | Role --- | --- | --- | --- Cathryn Yang | | provided data in digital form | Author, DataCollector Steve Pepper | | did initial concept and glottolog mapping | Other -Tiago Tresoldi | @tresoldi | maintainer | Other -Johann-Mattis List | @LinguList | maintainer | Other - +Tiago Tresoldi | @tresoldi | profile, code | Other +Johann-Mattis List | @LinguList | maintainer | Editor diff --git a/README.md b/README.md index e4098ab..62fba0b 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:** 8 -- **Concepts:** 1,000 +- **Varieties:** 8 (linked to 7 different Glottocodes) +- **Concepts:** 1,000 (linked to 877 different Concepticon concept sets) - **Lexemes:** 8,505 - **Sources:** 1 - **Synonymy:** 1.13 @@ -36,7 +36,7 @@ Conceptlists in Concepticon: - **Cognate Diversity:** 0.03 - **Invalid lexemes:** 0 - **Tokens:** 53,082 -- **Segments:** 209 (0 BIPA errors, 0 CTLS sound class errors, 209 CLTS modified) +- **Segments:** 209 (0 BIPA errors, 0 CLTS sound class errors, 209 CLTS modified) - **Inventory size (avg):** 91.38 # Contributors @@ -45,9 +45,8 @@ Name | GitHub user | Description | Role --- | --- | --- | --- Cathryn Yang | | provided data in digital form | Author, DataCollector Steve Pepper | | did initial concept and glottolog mapping | Other -Tiago Tresoldi | @tresoldi | maintainer | Other -Johann-Mattis List | @LinguList | maintainer | Other - +Tiago Tresoldi | @tresoldi | profile, code | Other +Johann-Mattis List | @LinguList | maintainer | Editor diff --git a/cldf/README.md b/cldf/README.md index accaf5a..7205fdb 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/Yang-2011-1014
[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/yanglalo -[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) |
  1. lexibank/yanglalo v2.0.1-14-gf7b5b01
  2. Glottolog v4.4
  3. Concepticon v2.5.0
  4. CLTS v2.1.0
-[prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) |
  1. lingpy-rcParams: lingpy-rcParams.json
  2. python: 3.8.10
  3. python-packages: requirements.txt
+[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) |
  1. lexibank/yanglalo v3.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) | yanglalo [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`
≥ -90
≤ 90 | +[Longitude](http://cldf.clld.org/v1.0/terms.rdf#longitude) | `decimal`
≥ -180
≤ 180 | `Family` | `string` | `Location` | `string` | `Source_ID` | `string` | diff --git a/cldf/cldf-metadata.json b/cldf/cldf-metadata.json index 988e669..40345de 100644 --- a/cldf/cldf-metadata.json +++ b/cldf/cldf-metadata.json @@ -16,25 +16,25 @@ { "rdf:about": "https://github.com/lexibank/yanglalo", "rdf:type": "prov:Entity", - "dc:created": "v2.0.1-14-gf7b5b01", + "dc:created": "v3.0", "dc:title": "Repository" }, { "rdf:about": "https://github.com/glottolog/glottolog", "rdf:type": "prov:Entity", - "dc:created": "v4.4", + "dc:created": "v5.0", "dc:title": "Glottolog" }, { "rdf:about": "https://github.com/concepticon/concepticon-data", "rdf:type": "prov:Entity", - "dc:created": "v2.5.0", + "dc:created": "v3.2.0", "dc:title": "Concepticon" }, { "rdf:about": "https://github.com/cldf-clts/clts", "rdf:type": "prov:Entity", - "dc:created": "v2.1.0", + "dc:created": "v2.3.0", "dc:title": "CLTS" } ], @@ -45,7 +45,7 @@ }, { "dc:title": "python", - "dc:description": "3.8.10" + "dc:description": "3.12.4" }, { "dc:title": "python-packages", @@ -54,9 +54,6 @@ ], "rdf:ID": "yanglalo", "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" }, { @@ -258,7 +255,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" }, { diff --git a/cldf/lingpy-rcParams.json b/cldf/lingpy-rcParams.json index 081cafe..7240b24 100644 --- a/cldf/lingpy-rcParams.json +++ b/cldf/lingpy-rcParams.json @@ -64,7 +64,7 @@ 10, 10 ], - "filename": "lingpy-2021-07-22", + "filename": "lingpy-2024-08-01", "gap_symbol": "-", "gap_weight": 0.5, "gop": -2, @@ -123,7 +123,7 @@ "scorer": {}, "sonar": true, "stress": "\u02c8\u02cc'", - "timestamp": "2021-07-22 15:28", + "timestamp": "2024-08-01 11:19", "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/parameters.csv b/cldf/parameters.csv index f82bc9b..8d40217 100644 --- a/cldf/parameters.csv +++ b/cldf/parameters.csv @@ -369,7 +369,7 @@ ID,Name,Concepticon_ID,Concepticon_Gloss,Chinese_Gloss 374_fathersos,father's OS,3041,PATERNAL AUNT (FATHER'S OLDER SISTER),姑妈 375_fathersyb,father's YB,2174,PATERNAL UNCLE (FATHER'S YOUNGER BROTHER),叔叔 376_mothersob,mother's OB,,,舅舅 -377_mothersos,mother's OS,3042,MATERNAL AUNT (MOTHER'S OLDER SISTER),姨母 +377_mothersos,mother's OS,2176,MATERNAL AUNT,姨母 378_malesuffix,male suffix,,,公的 379_femalesuffix,female suffix,,,母的 380_fatherchildrenclf,father+children (CLF),,,三父子 @@ -556,7 +556,7 @@ ID,Name,Concepticon_ID,Concepticon_Gloss,Chinese_Gloss 561_tossoverhand,toss (overhand),1456,THROW,投 562_stretchstretchout,stretch; stretch out,214,STRETCH,伸 (伸手) 563_pound,pound,354,POUND,舂/捣碎 -564_liftoverhead,lift (over head),501,LIFT,举起 +564_liftoverhead,lift (over head),1317,RAISE,举起 565_fold,fold,1470,FOLD,折 566_squeeze,squeeze,1414,SQUEEZE,挤压/榨 567_pinch,pinch,378,PINCH,捏 diff --git a/cldf/requirements.txt b/cldf/requirements.txt index 0267e9b..19ecbc1 100644 --- a/cldf/requirements.txt +++ b/cldf/requirements.txt @@ -1,48 +1,56 @@ appdirs==1.4.4 -bs4==0.0.1 -certifi==2021.5.30 -chardet==4.0.0 -cldfbench==1.7.1 -cldfcatalog==1.3.2 -clldutils==3.9.0 -colorlog==5.0.1 -csvw==1.11.0 -gitdb==4.0.7 -greenlet==1.1.0 -idna==2.10 -iniconfig==1.1.1 -isodate==0.6.0 -lingpy==2.6.8 -Markdown==3.3.4 -networkx==2.6.1 -newick==1.3.0 -numpy==1.21.0 -openpyxl==3.0.7 -packaging==21.0 -pluggy==0.13.1 -purl==1.6 -py==1.10.0 +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.1 +clldutils==3.22.2 +colorama==0.4.6 +colorlog==6.8.2 +csvw==3.3.0 +gitdb==4.0.11 +greenlet==3.0.3 +idna==3.7 +iniconfig==2.0.0 +isodate==0.6.1 +jsonschema==4.23.0 +lingpy==2.6.13 +lxml==5.2.2 +Markdown==3.6 +nameparser==1.1.3 +networkx==3.3 +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.22.0 -pyclts==3.1.1 -pyconcepticon==2.8.0 -pycountry==20.7.3 -pyglottolog==3.6.0 -pylexibank==3.2.0 -pytest==6.2.4 -regex==2021.7.6 -requests==2.25.1 +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.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 -scipy==1.7.0 -segments==2.2.0 +segments==2.2.1 six==1.16.0 -smmap==4.0.0 -soupsieve==2.2.1 -SQLAlchemy==1.4.20 -tabulate==0.8.9 -termcolor==1.1.0 -tqdm==4.61.2 -uritemplate==3.0.1 -urllib3==1.26.6 +smmap==5.0.1 +soupsieve==2.5 +SQLAlchemy==1.4.53 +tabulate==0.9.0 +termcolor==2.4.0 +tqdm==4.66.4 +uritemplate==4.1.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/lexibank_yanglalo.py b/lexibank_yanglalo.py index e7881d3..aaa9ea8 100644 --- a/lexibank_yanglalo.py +++ b/lexibank_yanglalo.py @@ -21,6 +21,8 @@ class CustomConcept(pylexibank.Concept): class Dataset(pylexibank.Dataset): id = "yanglalo" dir = Path(__file__).parent + writer_options = dict(keep_languages=False, keep_parameters=False) + concept_class = CustomConcept language_class = CustomLanguage form_spec = pylexibank.FormSpec(missing_data=("烂饭", "-"), first_form_only=True)