Skip to content

Commit

Permalink
first stab at new dataset model
Browse files Browse the repository at this point in the history
  • Loading branch information
xrotwang committed Nov 13, 2023
1 parent c1eb718 commit 6b285bc
Show file tree
Hide file tree
Showing 29 changed files with 327,987 additions and 66 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: [ main ]
pull_request:
branches: [ main ]

jobs:
build:

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

steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
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/StructureDataset-metadata.json test.py
73 changes: 8 additions & 65 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ __pycache__/

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
Expand All @@ -20,11 +21,9 @@ parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
Expand All @@ -39,17 +38,13 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
Expand All @@ -58,8 +53,6 @@ cover/
# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
Expand All @@ -72,61 +65,27 @@ instance/
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
.python-version

# celery beat schedule file
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
# dotenv
.env

# virtualenv
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
Expand All @@ -140,21 +99,5 @@ venv.bak/

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/
.idea/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
95 changes: 95 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
{
"creators": [
{
"name": "Murdock, G. P."
},
{
"name": "R. Textor"
},
{
"name": "H. Barry, III"
},
{
"name": "D. R. White"
},
{
"name": "J. P. Gray"
},
{
"name": "W. T. Divale"
}
],
"contributors": [
{
"name": "Kathryn R. Kirby",
"type": "Editor"
},
{
"name": "Russell D. Gray",
"type": "Editor"
},
{
"name": "Simon J. Greenhill",
"type": "Editor"
},
{
"name": "Fiona M. Jordan",
"type": "Editor"
},
{
"name": "Stephanie Gomes-Ng",
"type": "Editor"
},
{
"name": "Hans-J\u00f6rg Bibiko",
"type": "Editor"
},
{
"name": "Dami\u00e1n E. Blasi",
"type": "Editor"
},
{
"name": "Carlos A. Botero",
"type": "Editor"
},
{
"name": "Claire Bowern",
"type": "Editor"
},
{
"name": "Carol R. Ember",
"type": "Editor"
},
{
"name": "Dan Leehr",
"type": "Editor"
},
{
"name": "Bobbi S. Low",
"type": "Editor"
},
{
"name": "Joe McCarter",
"type": "Editor"
},
{
"name": "William Divale",
"type": "Editor"
},
{
"name": "Michael C. Gavin",
"type": "Editor"
}
],
"title": "D-PLACE dataset derived from Murdock et al. 1999 'Ethnographic Atlas'",
"access_right": "open",
"keywords": [
"cldf:StructureDataset",
"linguistics"
],
"upload_type": "dataset",
"description": "<p>Cite the source of the dataset as:</p>\n\n<blockquote>\n<p>Murdock, G. P., R. Textor, H. Barry, III, D. R. White, J. P. Gray, and W. T. Divale. 1999. Ethnographic Atlas. World Cultures 10:24-136 (codebook)</p>\n</blockquote>",
"license": {
"id": "CC-BY-NC-4.0"
}
}
25 changes: 25 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Contributors

Name | GitHub user | Role
--- | --- | ---
Murdock, G. P. | | Author
R. Textor | | Author
H. Barry, III | | Author
D. R. White | | Author
J. P. Gray | | Author
W. T. Divale | | Author
Kathryn R. Kirby | | editor
Russell D. Gray | | editor
Simon J. Greenhill | | editor
Fiona M. Jordan | | editor
Stephanie Gomes-Ng | | editor
Hans-Jörg Bibiko | | editor
Damián E. Blasi | | editor
Carlos A. Botero | | editor
Claire Bowern | | editor
Carol R. Ember | | editor
Dan Leehr | | editor
Bobbi S. Low | | editor
Joe McCarter | | editor
William Divale | | editor
Michael C. Gavin | | editor
Loading

0 comments on commit 6b285bc

Please sign in to comment.