Skip to content

Commit 9535850

Browse files
committed
Updated codemeta to use affiliation of PersonOrOrganization rather than string
1 parent cf17bb4 commit 9535850

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ authors:
55
- family-names: Doiel
66
given-names: Robert
77
orcid: https://orcid.org/0000-0003-0900-6903
8-
version: 1.0.5
8+
version: 1.1.0
99
title: datatools
10-
date-released: 2022-05-11
10+
date-released: 2022-06-23

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,10 @@ clean:
7575
@if [ -d dist ]; then rm -fR dist; fi
7676
@if [ -d man ]; then rm -fR man; fi
7777

78+
# NOTE: macOS causes problems if you copy a binary versus move it.
7879
install: build
7980
@echo "Installing programs in $(PREFIX)/bin"
80-
@for FNAME in $(PROGRAMS); do if [ -f ./bin/$$FNAME ]; then cp -v ./bin/$$FNAME $(PREFIX)/bin/$$FNAME; fi; done
81+
@for FNAME in $(PROGRAMS); do if [ -f ./bin/$$FNAME ]; then mv -v ./bin/$$FNAME $(PREFIX)/bin/$$FNAME; fi; done
8182
@echo ""
8283
@echo "Make sure $(PREFIX)/bin is in your PATH"
8384

codemeta.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@
66
"codeRepository": "https://github.com/caltechlibrary/datatools",
77
"issueTracker": "https://github.com/caltechlibrary/datatools/issues",
88
"license": "https://data.caltech.edu/license",
9-
"version": "1.0.5",
9+
"version": "1.1.0",
1010
"author": [
1111
{
1212
"@type": "Person",
1313
"givenName": "Robert",
1414
"familyName": "Doiel",
15-
"affiliation": "Caltech Library",
15+
"affiliation": {
16+
"@type": "Organization",
17+
"name": "Caltech Library"
18+
},
1619
"email": "[email protected]",
1720
"@id": "https://orcid.org/0000-0003-0900-6903"
1821
}

codemeta/codemeta.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ type PersonOrOrganization struct {
1717
// Name is used by organizations
1818
Name string `json:"name,omitempty"`
1919
// Given/Family are used by individual persons
20-
GivenName string `json:"givenName,omitempty"`
21-
FamilyName string `json:"familyName,omitempty"`
22-
Affiliation string `json:"affiliation,omitempty"`
23-
Email string `json:"email,omitempty"`
20+
GivenName string `json:"givenName,omitempty"`
21+
FamilyName string `json:"familyName,omitempty"`
22+
Affiliation *PersonOrOrganization `json:"affiliation,omitempty"`
23+
Email string `json:"email,omitempty"`
2424
}
2525

2626
type Codemeta struct {

version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package datatools
22

3-
const Version = "1.0.5"
3+
const Version = "1.1.0"
44

0 commit comments

Comments
 (0)