Skip to content

Support RO-Crate 1.3 metadata #261

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

Draft
sapunyangkut wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Support RO-Crate 1.3 metadata #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion rocrate/model/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
SUPPORTED_VERSIONS = {
"1.0", "1.0-DRAFT",
"1.1", "1.1-DRAFT",
"1.2", "1.2-DRAFT"
"1.2", "1.2-DRAFT",
"1.3"
}
DEFAULT_VERSION = "1.2"
BASENAME = "ro-crate-metadata.json"
Expand Down
13 changes: 10 additions & 3 deletions test/test_write.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
from urllib.error import URLError

from rocrate.model import Dataset, Person
from rocrate.model.metadata import DEFAULT_VERSION
from rocrate.rocrate import ROCrate


Expand Down Expand Up @@ -758,7 +759,7 @@ def test_subcrates_creation(test_data_dir, tmpdir, to_zip):
assert out_subcrate_crate.get("subsubcrate/setup.cfg") is out_subsubf


@pytest.mark.parametrize("version", ["1.0", "1.1", "1.2"])
@pytest.mark.parametrize("version", ["1.0", "1.1", "1.2", "1.3"])
def test_write_version(tmpdir, helpers, version):
basename = helpers.LEGACY_METADATA_FILE_NAME if version == "1.0" else helpers.METADATA_FILE_NAME
crate = ROCrate(version=version)
Expand All @@ -774,6 +775,10 @@ def test_write_version(tmpdir, helpers, version):
assert data["@context"] == f"https://w3id.org/ro/crate/{version}/context"


def test_default_version():
assert DEFAULT_VERSION == "1.2"


@pytest.mark.parametrize("to_zip", [False, True])
def test_detached_creation(tmpdir, to_zip):
base_uri = "http://example.com/crate/"
Expand Down Expand Up @@ -813,11 +818,12 @@ def test_detached_creation(tmpdir, to_zip):
assert rp["name"] == name


def test_detached_creation_write_detached(tmpdir):
@pytest.mark.parametrize("version", ["1.2", "1.3"])
def test_detached_creation_write_detached(tmpdir, version):
base_uri = "http://example.com/crate/"
orcid = "https://orcid.org/0000-0002-1825-0097"
name = "Josiah Carberry"
crate = ROCrate(root_dataset_id=base_uri)
crate = ROCrate(root_dataset_id=base_uri, version=version)
crate.add_dataset(f"{base_uri}d1")
crate.add_file(f"{base_uri}f1")
crate.add(Person(crate, orcid, properties={"name": name}))
Expand All @@ -827,6 +833,7 @@ def test_detached_creation_write_detached(tmpdir):
rcrate = ROCrate(detached_md_path)
assert rcrate.source == detached_md_path
assert rcrate.metadata.source == "ro-crate-metadata.json"
assert rcrate.metadata.version == version
assert rcrate.root_dataset.id == base_uri
assert rcrate.metadata.id == "ro-crate-metadata.json"
assert rcrate.metadata["about"] is rcrate.root_dataset
Expand Down