v3.1

D-PLACE · Aug 15, 2024 · c00e58b · c00e58b
1 parent b68c021
commit c00e58b
Show file tree

Hide file tree

Showing 117 changed files with 50,703 additions and 1,933 deletions.
diff --git a/.github/workflows/cldf-validation.yml b/.github/workflows/cldf-validation.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "raw/datasets/carneiro"]
+	path = raw/datasets/carneiro
+	url = https://github.com/D-PLACE/dplace-dataset-carneiro
 [submodule "raw/datasets/binford"]
 	path = raw/datasets/binford
 	url = https://github.com/D-PLACE/dplace-dataset-binford

diff --git a/.zenodo.json b/.zenodo.json
@@ -64,6 +64,9 @@
         },
         {
             "name": "Michael C. Gavin"
+        },
+        {
+            "name": "V\u00e1clav Hrn\u010d\u00ed\u0159"
         }
     ],
     "title": "D-PLACE aggregated dataset",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Changes
+
+## [v3.1]
+
+Added dataset Carneiro.
+
+
+## [v3.0]
+
+Initial release of the D-PLACE aggregated dataset in CLDF format.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,21 +1,22 @@
 # Contributors
 
 Name                           | GitHub user | Role
----                            | ---         | ---
-Kathryn R. Kirby | | Author
-Russell D. Gray | | Author
-Simon J. Greenhill | | Author
-Fiona M. Jordan | | Author
-Stephanie Gomes-Ng | | Author
-Hans-Jörg Bibiko | | Author
-Damián E. Blasi | | Author
-Carlos A. Botero | | Author
-Claire Bowern | | Author
-Carol R. Ember | | Author
-Dan Leehr | | Author
-Bobbi S. Low | | Author
-Joe McCarter | | Author
-William Divale | | Author
-Michael C. Gavin | | Author
-Robert Forkel | @xrotwang | DataCurator
+---                            |-------------| ---
+Kathryn R. Kirby |             | Author
+Russell D. Gray |             | Author
+Simon J. Greenhill |             | Author
+Fiona M. Jordan |             | Author
+Stephanie Gomes-Ng |             | Author
+Hans-Jörg Bibiko |             | Author
+Damián E. Blasi |             | Author
+Carlos A. Botero |             | Author
+Claire Bowern |             | Author
+Carol R. Ember |             | Author
+Dan Leehr |             | Author
+Bobbi S. Low |             | Author
+Joe McCarter |             | Author
+William Divale |             | Author
+Michael C. Gavin |             | Author
+Václav Hrnčíř | @hrncirv    | Author
+Robert Forkel | @xrotwang   | DataCurator
 
diff --git a/README.md b/README.md
@@ -48,18 +48,19 @@ in the [CLDF metadata](cldf/StructureDataset-metadata.json) - to refer to tables
 
 | title | version | DOI |
 |:---------------------------------------------------------------------------------------------------------------------------------|:----------|:-------------------------------------------------------------------|
-| D-PLACE dataset derived from Binford 2001 'Constructing Frames of Reference' | v3.0.1 | [10.5281/zenodo.10201125](https://doi.org/10.5281/zenodo.10201125) |
-| D-PLACE dataset derived from Bertolo et al. 2023 'Cross-cultural music corpus: The Expanded Natural History of Song Discography' | v3.0 | [10.5281/zenodo.10201382](https://doi.org/10.5281/zenodo.10201382) |
-| D-PLACE dataset derived from Murdock et al. 1999 'Ethnographic Atlas' | v3.0 | [10.5281/zenodo.10177061](https://doi.org/10.5281/zenodo.10177061) |
-| D-PLACE dataset derived from Lima-Ribeiro et al. 2015 'ecoClimate' | v3.0 | [10.5281/zenodo.10179301](https://doi.org/10.5281/zenodo.10179301) |
-| D-PLACE dataset derived from 'Global Multi-resolution Terrain Elevation Data 2010' | v3.0 | [10.5281/zenodo.10180043](https://doi.org/10.5281/zenodo.10180043) |
-| D-PLACE dataset derived from Wessel and Smith 2015 'Global Self-consistent, Hierarchical, High-resolution Geography Database' | v3.0.1 | [10.5281/zenodo.10182319](https://doi.org/10.5281/zenodo.10182319) |
-| D-PLACE dataset derived from Jenkins et al. 2013 'Global patterns of terrestrial vertebrate diversity and conservation' | v3.0 | [10.5281/zenodo.10182356](https://doi.org/10.5281/zenodo.10182356) |
-| D-PLACE dataset derived from Kreft and Jetz 2007 'Global patterns and determinants of vascular plant diversity' | v3.0 | [10.5281/zenodo.10182361](https://doi.org/10.5281/zenodo.10182361) |
-| D-PLACE dataset derived from NASA TERRA/MODIS 'Net Primary Productivity' | v3.0 | [10.5281/zenodo.10183957](https://doi.org/10.5281/zenodo.10183957) |
-| D-PLACE dataset derived from Murdock and White 1969 'Standard Cross-Cultural Sample' | v3.0 | [10.5281/zenodo.10201075](https://doi.org/10.5281/zenodo.10201075) |
-| D-PLACE dataset derived from Olson et al. 2001 'Terrestrial Ecoregions of the World' | v3.0 | [10.5281/zenodo.10201087](https://doi.org/10.5281/zenodo.10201087) |
-| D-PLACE dataset derived from Jorgensen 1980 'Western Indians' | v3.0 | [10.5281/zenodo.10201104](https://doi.org/10.5281/zenodo.10201104) |
+| D-PLACE dataset derived from Binford 2001 'Constructing Frames of Reference' | v3.1 | [10.5281/zenodo.13319363](https://doi.org/10.5281/zenodo.13319363) |
+| D-PLACE dataset derived from Robert L. Carneiro's Dataset (6th edition) | v3.1 | [10.5281/zenodo.13325962](https://doi.org/10.5281/zenodo.13325962) |
+| D-PLACE dataset derived from Bertolo et al. 2023 'Cross-cultural music corpus: The Expanded Natural History of Song Discography' | v3.1 | [10.5281/zenodo.13319593](https://doi.org/10.5281/zenodo.13319593) |
+| D-PLACE dataset derived from Murdock et al. 1999 'Ethnographic Atlas' | v3.1 | [10.5281/zenodo.13319191](https://doi.org/10.5281/zenodo.13319191) |
+| D-PLACE dataset derived from Lima-Ribeiro et al. 2015 'ecoClimate' | v3.1 | [10.5281/zenodo.13318981](https://doi.org/10.5281/zenodo.13318981) |
+| D-PLACE dataset derived from 'Global Multi-resolution Terrain Elevation Data 2010' | v3.1 | [10.5281/zenodo.13318960](https://doi.org/10.5281/zenodo.13318960) |
+| D-PLACE dataset derived from Wessel and Smith 2015 'Global Self-consistent, Hierarchical, High-resolution Geography Database' | v3.1 | [10.5281/zenodo.13318941](https://doi.org/10.5281/zenodo.13318941) |
+| D-PLACE dataset derived from Jenkins et al. 2013 'Global patterns of terrestrial vertebrate diversity and conservation' | v3.1 | [10.5281/zenodo.13318912](https://doi.org/10.5281/zenodo.13318912) |
+| D-PLACE dataset derived from Kreft and Jetz 2007 'Global patterns and determinants of vascular plant diversity' | v3.1 | [10.5281/zenodo.13318895](https://doi.org/10.5281/zenodo.13318895) |
+| D-PLACE dataset derived from NASA TERRA/MODIS 'Net Primary Productivity' | v3.1 | [10.5281/zenodo.13318881](https://doi.org/10.5281/zenodo.13318881) |
+| D-PLACE dataset derived from Murdock and White 1969 'Standard Cross-Cultural Sample' | v3.1 | [10.5281/zenodo.13318864](https://doi.org/10.5281/zenodo.13318864) |
+| D-PLACE dataset derived from Olson et al. 2001 'Terrestrial Ecoregions of the World' | v3.1 | [10.5281/zenodo.13318848](https://doi.org/10.5281/zenodo.13318848) |
+| D-PLACE dataset derived from Jorgensen 1980 'Western Indians' | v3.1 | [10.5281/zenodo.13318637](https://doi.org/10.5281/zenodo.13318637) |
 
 ### Phlorest Phylogenies
 

diff --git a/RELEASING.md b/RELEASING.md
@@ -7,7 +7,7 @@
    ```
 
 ```shell
-cldfbench makecldf cldfbench_dplace.py --glottolog-version v4.8
+cldfbench makecldf cldfbench_dplace.py --glottolog-version v5.0
 ```
 
 ```shell
@@ -29,18 +29,7 @@ cldfbench cldfviz.map cldf --pacific-centered --format png --width 20 --output m
 cldferd --format compact.svg cldf > erd.svg
 ```
 
-FIXME: adapt to new data layout!
-
-1. Check out a local clone of dplace-data to a release tag.
-2. Run `dplace cldf` as follows:
-   ```shell script
-   dplace --repos ../dplace-data/ cldf ../../glottolog/glottolog v3.3 --cldf-repos ../dplace-cldf/
-   ```
-   Notes:
-   - The Glottolog version tag should be the one used to compile the dplace-data
-     release. It can be looked up in https://github.com/D-PLACE/dplace-data/blob/master/phylogenies/index.csv
-   - If the data contains value with undefined `Code_ID`, this code ID can be ignored - i.e. removed in the CLDF data - passing the `--fix-code-id` flag.
-3. Update `.zenodo.json`.
-4. Commit, tag and push the changes.
-5. Create a release on GitHub, thereby triggering archiving with Zenodo.
-6. Update the release description on GitHub with the DOI.
+4. Edit `CHANGELOG.md`.
+5. Commit, tag and push the changes.
+6. Create a release on GitHub, thereby triggering archiving with Zenodo.
+7. Update the release description on GitHub with the DOI.
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,6 +64,9 @@ @@
             },
             {
                 "name": "Michael C. Gavin"
+            },
+            {
+                "name": "V\u00e1clav Hrn\u010d\u00ed\u0159"
             }
         ],
         "title": "D-PLACE aggregated dataset",
@@ Expand Down @@