Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: adding datacite validation #181

Closed
wants to merge 2 commits into from
Closed

CI: adding datacite validation #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa6bd54
adding publish=True to some datacite test to enable datacite validation
djarecka May 19, 2023
7868ad3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions dandischema/tests/test_datacite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from ..models import LicenseType, PublishedDandiset, RelationType, RoleType


def datacite_post(datacite: dict, doi: str) -> None:
def _datacite_post(datacite: dict, doi: str) -> None:
"""Post the datacite object and check the status of the request"""

# removing doi in case it exists
Expand Down Expand Up @@ -53,9 +53,9 @@ def schema() -> Any:

@pytest.fixture(scope="function")
def metadata_basic() -> Dict[str, Any]:
dandi_id_noprefix = f"000{random.randrange(100, 999)}"
dandi_id_noprefix = "000002"
dandi_id = f"DANDI:{dandi_id_noprefix}"
version = "0.0.0"
version = f"0.0.{random.randrange(0, 9999)}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of random, perhaps use the current date+time in some form.

# meta data without doi, datePublished and publishedBy
meta_dict = {
"identifier": dandi_id,
Expand Down Expand Up @@ -152,9 +152,6 @@ def test_datacite(dandi_id: str, schema: Any) -> None:

datacite = to_datacite(meta=meta, validate=True)

# trying to post datacite
datacite_post(datacite, meta.doi)


@skipif_no_network
@pytest.mark.parametrize(
Expand Down Expand Up @@ -315,12 +312,14 @@ def test_dandimeta_datacite(

dandi_id = metadata_basic["identifier"]
dandi_id_noprefix = dandi_id.split(":")[1]

metadata_basic.update(_basic_publishmeta(dandi_id=dandi_id_noprefix))
version = metadata_basic["version"]
metadata_basic.update(
_basic_publishmeta(dandi_id=dandi_id_noprefix, version=version)
)
metadata_basic.update(additional_meta)

# creating and validating datacite objects
datacite = to_datacite(metadata_basic)
datacite = to_datacite(metadata_basic, publish=True)
Draft7Validator.check_schema(schema)
validator = Draft7Validator(schema)
validator.validate(datacite["data"]["attributes"])
Expand All @@ -342,20 +341,22 @@ def test_dandimeta_datacite(
assert attr[key] == el_flds

# trying to poste datacite
datacite_post(datacite, metadata_basic["doi"])
_datacite_post(datacite, metadata_basic["doi"])


def test_datacite_publish(metadata_basic: Dict[str, Any]) -> None:
"""checking to_datacite function with publish=True"""
dandi_id = metadata_basic["identifier"]
dandi_id_noprefix = dandi_id.split(":")[1]
version = metadata_basic["version"]
metadata_basic.update(_basic_publishmeta(dandi_id=dandi_id_noprefix))
metadata_basic.update(
_basic_publishmeta(dandi_id=dandi_id_noprefix, version=version)
)

# creating and validating datacite objects
datacite = to_datacite(metadata_basic, publish=True)

assert datacite == {
# 'data': {}
"data": {
"id": f"10.80507/dandi.{dandi_id_noprefix}/{version}",
"type": "dois",
Expand Down