Skip to content

Commit 9fdb221

Browse files
committed
release 3.1.1
1 parent c00e58b commit 9fdb221

File tree

8 files changed

+16
-6
lines changed

8 files changed

+16
-6
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changes
22

3+
4+
## [v3.1.1]
5+
6+
Added missing citation for dataset Carneiro.
7+
8+
39
## [v3.1]
410

511
Added dataset Carneiro.

CONTRIBUTORS.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ William Divale | | Author
1919
Michael C. Gavin | | Author
2020
Václav Hrnčíř | @hrncirv | Author
2121
Robert Forkel | @xrotwang | DataCurator
22-

RELEASING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,10 @@ cldferd --format compact.svg cldf > erd.svg
3131

3232
4. Edit `CHANGELOG.md`.
3333
5. Commit, tag and push the changes.
34+
```shell
35+
git commit -a -m"release X.Y.Z"
36+
git tag -a vX.Y.Z -m"release X.Y.Z"
37+
git push origin --tags
38+
```
3439
6. Create a release on GitHub, thereby triggering archiving with Zenodo.
3540
7. Update the release description on GitHub with the DOI.

cldf/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ property | value
1313
[dc:identifier](http://purl.org/dc/terms/identifier) | https://d-place.org
1414
[dc:license](http://purl.org/dc/terms/license) | https://creativecommons.org/licenses/by-nc/4.0/
1515
[dcat:accessURL](http://www.w3.org/ns/dcat#accessURL) | https://github.com/d-place/dplace-cldf
16-
[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/D-PLACE/dplace-dataset-binford/tree/v3.1">D-PLACE/dplace-dataset-binford v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-carneiro//tree/v3.1">D-PLACE/dplace-dataset-carneiro/ v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-ccmc/tree/v3.1">D-PLACE/dplace-dataset-ccmc v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-ea/tree/v3.1">D-PLACE/dplace-dataset-ea v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-ecoclimate/tree/v3.1">D-PLACE/dplace-dataset-ecoclimate v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-gmted2010/tree/v3.1">D-PLACE/dplace-dataset-gmted2010 v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-gshhs/tree/v3.1">D-PLACE/dplace-dataset-gshhs v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-jenkins/tree/v3.1">D-PLACE/dplace-dataset-jenkins v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-kreft/tree/v3.1">D-PLACE/dplace-dataset-kreft v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-modis/tree/v3.1">D-PLACE/dplace-dataset-modis v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-sccs/tree/v3.1">D-PLACE/dplace-dataset-sccs v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-teow/tree/v3.1">D-PLACE/dplace-dataset-teow v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-wnai/tree/v3.0">D-PLACE/dplace-dataset-wnai v3.0</a></li><li><a href="https://github.com/phlorest/atkinson2006/tree/v1.2">phlorest/atkinson2006 v1.2</a></li><li><a href="https://github.com/phlorest/birchall_et_al2016/tree/v1.1">phlorest/birchall_et_al2016 v1.1</a></li><li><a href="https://github.com/phlorest/bouckaert_et_al2012/tree/v1.1">phlorest/bouckaert_et_al2012 v1.1</a></li><li><a href="https://github.com/phlorest/bouckaert_et_al2018/tree/v1.1">phlorest/bouckaert_et_al2018 v1.1</a></li><li><a href="https://github.com/phlorest/bowern_and_atkinson2012/tree/v1.1">phlorest/bowern_and_atkinson2012 v1.1</a></li><li><a href="https://github.com/phlorest/chacon_and_list2015/tree/v1.1">phlorest/chacon_and_list2015 v1.1</a></li><li><a href="https://github.com/phlorest/chang_et_al2015/tree/v1.1">phlorest/chang_et_al2015 v1.1</a></li><li><a href="https://github.com/phlorest/defilippo_et_al2012/tree/v1.1">phlorest/defilippo_et_al2012 v1.1</a></li><li><a href="https://github.com/phlorest/dunn_et_al2011/tree/v1.1">phlorest/dunn_et_al2011 v1.1</a></li><li><a href="https://github.com/phlorest/gray_et_al2009/tree/v1.1.1">phlorest/gray_et_al2009 v1.1.1</a></li><li><a href="https://github.com/phlorest/greenhill2015/tree/v1.1">phlorest/greenhill2015 v1.1</a></li><li><a href="https://github.com/phlorest/grollemund_et_al2015/tree/v1.1">phlorest/grollemund_et_al2015 v1.1</a></li><li><a href="https://github.com/phlorest/honkola_et_al2013/tree/v1.1">phlorest/honkola_et_al2013 v1.1</a></li><li><a href="https://github.com/phlorest/hruschka_et_al2015/tree/v1.1">phlorest/hruschka_et_al2015 v1.1</a></li><li><a href="https://github.com/phlorest/kitchen_et_al2009/tree/v1.1">phlorest/kitchen_et_al2009 v1.1</a></li><li><a href="https://github.com/phlorest/kolipakam_et_al2018/tree/v1.1">phlorest/kolipakam_et_al2018 v1.1</a></li><li><a href="https://github.com/phlorest/lee2015/tree/v1.1">phlorest/lee2015 v1.1</a></li><li><a href="https://github.com/phlorest/lee_and_hasegawa2011/tree/v1.1">phlorest/lee_and_hasegawa2011 v1.1</a></li><li><a href="https://github.com/phlorest/lee_and_hasegawa2013/tree/v1.1">phlorest/lee_and_hasegawa2013 v1.1</a></li><li><a href="https://github.com/phlorest/robinson_and_holton2012/tree/v1.1">phlorest/robinson_and_holton2012 v1.1</a></li><li><a href="https://github.com/phlorest/sagart_et_al2019/tree/v1.1">phlorest/sagart_et_al2019 v1.1</a></li><li><a href="https://github.com/phlorest/sicoli_and_holton2014/tree/v1.1">phlorest/sicoli_and_holton2014 v1.1</a></li><li><a href="https://github.com/phlorest/walker_and_ribeiro2011/tree/v1.1">phlorest/walker_and_ribeiro2011 v1.1</a></li><li><a href="https://github.com/phlorest/zhang_et_al2019/tree/v1.1">phlorest/zhang_et_al2019 v1.1</a></li><li><a href="https://github.com/d-place/dplace-cldf/tree/v3.0.0">d-place/dplace-cldf v3.0.0</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v5.0">Glottolog v5.0</a></li></ol>
16+
[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/D-PLACE/dplace-dataset-binford/tree/v3.1">D-PLACE/dplace-dataset-binford v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-carneiro//tree/v3.1">D-PLACE/dplace-dataset-carneiro/ v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-ccmc/tree/v3.1">D-PLACE/dplace-dataset-ccmc v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-ea/tree/v3.1">D-PLACE/dplace-dataset-ea v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-ecoclimate/tree/v3.1">D-PLACE/dplace-dataset-ecoclimate v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-gmted2010/tree/v3.1">D-PLACE/dplace-dataset-gmted2010 v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-gshhs/tree/v3.1">D-PLACE/dplace-dataset-gshhs v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-jenkins/tree/v3.1">D-PLACE/dplace-dataset-jenkins v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-kreft/tree/v3.1">D-PLACE/dplace-dataset-kreft v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-modis/tree/v3.1">D-PLACE/dplace-dataset-modis v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-sccs/tree/v3.1">D-PLACE/dplace-dataset-sccs v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-teow/tree/v3.1">D-PLACE/dplace-dataset-teow v3.1</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-wnai/tree/v3.0">D-PLACE/dplace-dataset-wnai v3.0</a></li><li><a href="https://github.com/phlorest/atkinson2006/tree/v1.2">phlorest/atkinson2006 v1.2</a></li><li><a href="https://github.com/phlorest/birchall_et_al2016/tree/v1.1">phlorest/birchall_et_al2016 v1.1</a></li><li><a href="https://github.com/phlorest/bouckaert_et_al2012/tree/v1.1">phlorest/bouckaert_et_al2012 v1.1</a></li><li><a href="https://github.com/phlorest/bouckaert_et_al2018/tree/v1.1">phlorest/bouckaert_et_al2018 v1.1</a></li><li><a href="https://github.com/phlorest/bowern_and_atkinson2012/tree/v1.1">phlorest/bowern_and_atkinson2012 v1.1</a></li><li><a href="https://github.com/phlorest/chacon_and_list2015/tree/v1.1">phlorest/chacon_and_list2015 v1.1</a></li><li><a href="https://github.com/phlorest/chang_et_al2015/tree/v1.1">phlorest/chang_et_al2015 v1.1</a></li><li><a href="https://github.com/phlorest/defilippo_et_al2012/tree/v1.1">phlorest/defilippo_et_al2012 v1.1</a></li><li><a href="https://github.com/phlorest/dunn_et_al2011/tree/v1.1">phlorest/dunn_et_al2011 v1.1</a></li><li><a href="https://github.com/phlorest/gray_et_al2009/tree/v1.1.1">phlorest/gray_et_al2009 v1.1.1</a></li><li><a href="https://github.com/phlorest/greenhill2015/tree/v1.1">phlorest/greenhill2015 v1.1</a></li><li><a href="https://github.com/phlorest/grollemund_et_al2015/tree/v1.1">phlorest/grollemund_et_al2015 v1.1</a></li><li><a href="https://github.com/phlorest/honkola_et_al2013/tree/v1.1">phlorest/honkola_et_al2013 v1.1</a></li><li><a href="https://github.com/phlorest/hruschka_et_al2015/tree/v1.1">phlorest/hruschka_et_al2015 v1.1</a></li><li><a href="https://github.com/phlorest/kitchen_et_al2009/tree/v1.1">phlorest/kitchen_et_al2009 v1.1</a></li><li><a href="https://github.com/phlorest/kolipakam_et_al2018/tree/v1.1">phlorest/kolipakam_et_al2018 v1.1</a></li><li><a href="https://github.com/phlorest/lee2015/tree/v1.1">phlorest/lee2015 v1.1</a></li><li><a href="https://github.com/phlorest/lee_and_hasegawa2011/tree/v1.1">phlorest/lee_and_hasegawa2011 v1.1</a></li><li><a href="https://github.com/phlorest/lee_and_hasegawa2013/tree/v1.1">phlorest/lee_and_hasegawa2013 v1.1</a></li><li><a href="https://github.com/phlorest/robinson_and_holton2012/tree/v1.1">phlorest/robinson_and_holton2012 v1.1</a></li><li><a href="https://github.com/phlorest/sagart_et_al2019/tree/v1.1">phlorest/sagart_et_al2019 v1.1</a></li><li><a href="https://github.com/phlorest/sicoli_and_holton2014/tree/v1.1">phlorest/sicoli_and_holton2014 v1.1</a></li><li><a href="https://github.com/phlorest/walker_and_ribeiro2011/tree/v1.1">phlorest/walker_and_ribeiro2011 v1.1</a></li><li><a href="https://github.com/phlorest/zhang_et_al2019/tree/v1.1">phlorest/zhang_et_al2019 v1.1</a></li><li><a href="https://github.com/d-place/dplace-cldf/tree/v3.1.0">d-place/dplace-cldf v3.1.0</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v5.0">Glottolog v5.0</a></li></ol>
1717
[prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) | <ol><li><strong>python</strong>: 3.10.12</li><li><strong>python-packages</strong>: <a href="./requirements.txt">requirements.txt</a></li></ol>
1818
[rdf:ID](http://www.w3.org/1999/02/22-rdf-syntax-ns#ID) | dplace
1919
[rdf:type](http://www.w3.org/1999/02/22-rdf-syntax-ns#type) | http://www.w3.org/ns/dcat#Distribution

cldf/StructureDataset-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
{
239239
"rdf:about": "https://github.com/d-place/dplace-cldf",
240240
"rdf:type": "prov:Entity",
241-
"dc:created": "v3.0.0",
241+
"dc:created": "v3.1.0",
242242
"dc:title": "Repository"
243243
},
244244
{

cldf/contributions.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ID,Name,Description,Contributor,Citation,DOI,type,Source
22
dplace-dataset-binford,D-PLACE dataset derived from Binford 2001 'Constructing Frames of Reference',"The Binford Hunter-Gatherer dataset describes cultural practices for 339 hunter-gatherer groups. Approximately two-thirds of the societies described by Binford are also described in the Ethnographic Atlas. However, the Binford database includes a number of societies not in the Ethnographic Atlas, including many in Australia and northern North America.",Lewis R. Binford,"Lewis R. Binford. (2024). D-PLACE dataset derived from Binford 2001 'Constructing Frames of Reference' (v3.1) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.13319363
33
Binford, L. 2001. Constructing Frames of Reference: An Analytical Method for Archaeological Theory Building Using Hunter-gatherer and Environmental Data Sets. University of California Press",10.5281/zenodo.13319363,dataset,binford
4-
dplace-dataset-carneiro,D-PLACE dataset derived from Robert L. Carneiro's Dataset (6th edition),The Carneiro dataset (6th edition) describes 618 cultural practices for 72 societies that are globally distributed and encompass a wide range of cultural complexity. The data was collected by Robert Carneiro and his team in the 1960s and 1970s for the Scale Analysis project. The original notes are deposited at the American Museum of Natural History.,"Carneiro, Robert L.",,10.5281/zenodo.13325962,dataset,carneiro
4+
dplace-dataset-carneiro,D-PLACE dataset derived from Robert L. Carneiro's Dataset (6th edition),The Carneiro dataset (6th edition) describes 618 cultural practices for 72 societies that are globally distributed and encompass a wide range of cultural complexity. The data was collected by Robert Carneiro and his team in the 1960s and 1970s for the Scale Analysis project. The original notes are deposited at the American Museum of Natural History.,"Carneiro, Robert L.","Carneiro, R. L. (2024). D-PLACE dataset derived from Robert L. Carneiro's Dataset (6th edition) (v3.1) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.13325962",10.5281/zenodo.13325962,dataset,carneiro
55
dplace-dataset-ccmc,D-PLACE dataset derived from Bertolo et al. 2023 'Cross-cultural music corpus: The Expanded Natural History of Song Discography',"The Expanded Natural History of Song Discography contains more than 1000 audio recordings of vocal music gathered from many human societies, each annotated with a world region, language, and behavioural context.",Mila Bertolo and Martynas Snarskis and Manvir Singh and Samuel Mehr,"Mila Bertolo, Martynas Snarskis, Manvir Singh, & Samuel Mehr. (2024). D-PLACE dataset derived from Bertolo et al. 2023 'Cross-cultural music corpus: The Expanded Natural History of Song Discography' (v3.1) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.13319593
66
Mila Bertolo, Martynas Snarskis, Manvir Singh, & Samuel Mehr. (2023, August 8). Cross-cultural music corpus: The Expanded Natural History of Song Discography. Zenodo. https://doi.org/10.5281/zenodo.8378337",10.5281/zenodo.13319593,dataset,ccmc
77
dplace-dataset-ea,D-PLACE dataset derived from Murdock et al. 1999 'Ethnographic Atlas',"The Ethnographic Atlas (EA) describes cultural practices for 1291 societies, ranging from societies with complex agricultural economies and political systems to small hunter-gatherer groups. The societies are globally distributed with especially good coverage of Africa and western North America.","Murdock, G. P. and R. Textor and H. Barry, III and D. R. White and J. P. Gray and W. T. Divale","Murdock, G. P., R. Textor, H. Barry, I., D. R. White, J. P. Gray, & W. T. Divale. (2024). D-PLACE dataset derived from Murdock et al. 1999 'Ethnographic Atlas' (v3.1) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.13319191

cldfbench_dplace.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def add_contribution(self, writer, dsdir, cldf, type_, desc=None):
9999
Description=desc or cldf.properties.get('dc:description'),
100100
DOI=meta['doi'],
101101
Contributor=src['author'] if src else None,
102-
Citation='{}\n{}'.format(meta.get('cit', ''), cldf.properties['dc:bibliographicCitation']) if meta['name'] != 'carneiro' else '',
102+
Citation='{}\n{}'.format(meta.get('cit', ''), cldf.properties.get('dc:bibliographicCitation', '')).strip(),
103103
Source=[src.id] if src else [],
104104
type=type_,
105105
)

raw/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Raw data downloaded 2024-08-15T11:53:57.574543
1+
Raw data downloaded 2024-08-15T12:52:49.233352

0 commit comments

Comments
 (0)