Skip to content

Commit

Permalink
Release prep
Browse files Browse the repository at this point in the history
  • Loading branch information
chrzyki committed Dec 19, 2023
1 parent 85404fa commit 3cd4475
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 77 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/cldf-validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: CLDF-validation

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest-cldf
- name: Test with pytest
run: |
pytest --cldf-metadata=cldf/cldf-metadata.json test.py
6 changes: 0 additions & 6 deletions .travis.yml

This file was deleted.

6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# CLDF dataset derived from Othaniel's "Jen Cluster Comparative Wordlist" from 2017

[![CLDF validation](https://github.com/lexibank/othanieljen/workflows/CLDF-validation/badge.svg)](https://github.com/lexibank/othanieljen/actions?query=workflow%3ACLDF-validation)

## How to cite

If you use these data please cite
Expand All @@ -18,7 +20,7 @@ Conceptlists in Concepticon:
## Statistics


[![Build Status](https://travis-ci.org/lexibank/othanieljen.svg?branch=master)](https://travis-ci.org/lexibank/othanieljen)
[![CLDF validation](https://github.com/lexibank/othanieljen/workflows/CLDF-validation/badge.svg)](https://github.com/lexibank/othanieljen/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%")
Expand All @@ -32,7 +34,7 @@ Conceptlists in Concepticon:
- **Synonymy:** 1.00
- **Invalid lexemes:** 0
- **Tokens:** 9,937
- **Segments:** 231 (0 BIPA errors, 0 CTLS sound class errors, 231 CLTS modified)
- **Segments:** 231 (0 BIPA errors, 0 CLTS sound class errors, 231 CLTS modified)
- **Inventory size (avg):** 101.80

# Contributors
Expand Down
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/Othaniel-2017-300</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/othanieljen
[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/lexibank/othanieljen/tree/402c7e8">lexibank/othanieljen 402c7e8</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.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/lexibank/othanieljen/tree/85404fa">lexibank/othanieljen 85404fa</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.10.12</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) | othanieljen
[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` |

## <a name="table-parameterscsv"></a>Table [parameters.csv](./parameters.csv)
Expand Down
13 changes: 5 additions & 8 deletions cldf/cldf-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"rdf:about": "https://github.com/lexibank/othanieljen",
"rdf:type": "prov:Entity",
"dc:created": "402c7e8",
"dc:created": "85404fa",
"dc:title": "Repository"
},
{
Expand All @@ -32,7 +32,7 @@
"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:title": "CLTS"
Expand All @@ -45,7 +45,7 @@
},
{
"dc:title": "python",
"dc:description": "3.9.16"
"dc:description": "3.10.12"
},
{
"dc:title": "python-packages",
Expand All @@ -54,9 +54,6 @@
],
"rdf:ID": "othanieljen",
"rdf:type": "http://www.w3.org/ns/dcat#Distribution",
"dialect": {
"commentPrefix": null
},
"tables": [
{
"dc:conformsTo": "http://cldf.clld.org/v1.0/terms.rdf#FormTable",
Expand Down Expand Up @@ -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"
},
{
Expand Down Expand Up @@ -246,7 +243,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"
},
{
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-12-18",
"filename": "lingpy-2023-12-19",
"gap_symbol": "-",
"gap_weight": 0.5,
"gop": -2,
Expand Down Expand Up @@ -123,7 +123,7 @@
"scorer": {},
"sonar": true,
"stress": "\u02c8\u02cc'",
"timestamp": "2023-12-18 14:39",
"timestamp": "2023-12-19 08:30",
"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
99 changes: 46 additions & 53 deletions cldf/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,65 +1,58 @@
appdirs==1.4.4
attrs==23.1.0
Babel==2.14.0
bibtexparser==2.0.0b4
bs4==0.0.1
certifi==2021.10.8
cldfbench==1.8.0
cldfcatalog==1.3.2
cldfviz==0.5.0
cldfzenodo==0.2.0
clldutils==3.10.0
cltoolkit==0.1.1
colorlog==6.6.0
csvw==1.11.0
cycler==0.11.0
gitdb==4.0.9
greenlet==1.1.2
html5lib==1.1
idna==3.3
igraph==0.9.8
iniconfig==1.1.1
isodate==0.6.0
joblib==1.1.0
kiwisolver==1.3.2
certifi==2023.11.17
cldfbench==1.14.0
cldfcatalog==1.5.1
cldfzenodo==2.1.0
clldutils==3.22.1
colorama==0.4.6
colorlog==6.8.0
csvw==3.2.1
exceptiongroup==1.2.0
gitdb==4.0.11
greenlet==3.0.2
idna==3.6
iniconfig==2.0.0
isodate==0.6.1
jsonschema==4.20.0
lingpy==2.6.13
lxml==4.9.3
Markdown==3.3.4
matplotlib==3.4.3
nameparser==1.0.6
networkx==2.6.3
newick==1.3.1
numpy==1.21.4
openpyxl==3.0.9
packaging==21.2
pluggy==1.0.0
Markdown==3.5.1
nameparser==1.1.3
networkx==3.2.1
newick==1.9.0
numpy==1.26.2
openpyxl==3.1.2
packaging==23.2
pluggy==1.3.0
purl==1.6
py==1.11.0
pybtex==0.24.0
pycldf==1.23.0
pycldf==1.36.0
pyclts==3.1.1
pyconcepticon==2.8.0
pycountry==20.7.3
pyglottolog==3.6.0
pylexibank==3.3.0
pyparsing==2.4.7
pytest==6.2.5
pyconcepticon==3.0.0
pycountry==23.12.11
pyglottolog==3.12.0
pylatexenc==2.10
pylexibank==3.4.0
pytest==7.4.3
python-dateutil==2.8.2
python-igraph==0.9.8
regex==2021.11.10
requests==2.26.0
rdflib==7.0.0
referencing==0.32.0
regex==2023.10.3
requests==2.31.0
rfc3986==1.5.0
scipy==1.7.2
segments==2.2.0
segments==2.2.1
six==1.16.0
smmap==5.0.0
soupsieve==2.3.1
SQLAlchemy==1.4.27
tabulate==0.8.9
termcolor==1.1.0
texttable==1.6.4
threadpoolctl==3.0.0
tqdm==4.62.3
smmap==5.0.1
soupsieve==2.5
SQLAlchemy==1.4.50
tabulate==0.9.0
termcolor==2.4.0
tqdm==4.66.1
uritemplate==4.1.1
urllib3==1.26.7
webencodings==0.5.1
urllib3==2.1.0
xlrd==2.0.1
yattag==1.14.0
zenodoclient==0.4.1
zenodoclient==0.5.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
]
},
install_requires=[
'pylexibank>=1.1.1',
'pylexibank>=3.0.0',
],
extras_require={
'test': [
Expand Down
2 changes: 1 addition & 1 deletion test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ def test_valid(cldf_dataset, cldf_logger):


def test_forms(cldf_dataset):
assert len(list(cldf_dataset["FormTable"])) == 2999
assert len(list(cldf_dataset["FormTable"])) == 2998
assert any(f["Form"] == "nɨ̀ŋbjə̀ŋ" for f in cldf_dataset["FormTable"])


Expand Down

0 comments on commit 3cd4475

Please sign in to comment.