diff --git a/CITATION.cff b/CITATION.cff index aab9691..fd09e4e 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,6 +1,9 @@ cff-version: 1.1.0 message: "Cite as" authors: + - family-names: Chadwick + given-names: Eli + orcid: https://orcid.org/0000-0002-0035-6475 - family-names: De Geest given-names: Paul orcid: https://orcid.org/0000-0002-8940-4946 @@ -13,6 +16,9 @@ authors: - family-names: Gaignard given-names: Alban orcid: https://orcid.org/0000-0002-3597-8557 + - family-names: Hörtenhuber + given-names: Matthias + orcid: https://orcid.org/0000-0002-5599-5565 - family-names: Huber given-names: Sebastiaan orcid: https://orcid.org/0000-0001-5845-8880 diff --git a/README.md b/README.md index 76aa7e2..83c1cf6 100644 --- a/README.md +++ b/README.md @@ -404,6 +404,7 @@ Options: * Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES * Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT * Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH + * Copyright 2024 Data Centre, SciLifeLab, SE Licensed under the Apache License, version 2.0 , diff --git a/examples/read_test_metadata.py b/examples/read_test_metadata.py index 3efa818..91b8a37 100644 --- a/examples/read_test_metadata.py +++ b/examples/read_test_metadata.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/__init__.py b/rocrate/__init__.py index 09d5d2f..5efaa44 100644 --- a/rocrate/__init__.py +++ b/rocrate/__init__.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,10 +29,12 @@ """ __author__ = ", ".join(( + 'Eli Chadwick', 'Paul De Geest', 'Bert Droesbeke', 'Ignacio Eguinoa', 'Alban Gaignard', + 'Matthias Hörtenhuber', 'Sebastiaan Huber', 'Bruno Kinoshita', 'Simone Leo', @@ -46,6 +49,7 @@ Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +Copyright 2024 Data Centre, SciLifeLab, SE """ __license__ = ("Apache License, version 2.0 " "") diff --git a/rocrate/cli.py b/rocrate/cli.py index b4ff19e..035d2f9 100644 --- a/rocrate/cli.py +++ b/rocrate/cli.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/metadata.py b/rocrate/metadata.py index 0662d02..2cbce35 100644 --- a/rocrate/metadata.py +++ b/rocrate/metadata.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/__init__.py b/rocrate/model/__init__.py index 996a567..6e3d753 100644 --- a/rocrate/model/__init__.py +++ b/rocrate/model/__init__.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/computationalworkflow.py b/rocrate/model/computationalworkflow.py index 9fbf270..d150b20 100644 --- a/rocrate/model/computationalworkflow.py +++ b/rocrate/model/computationalworkflow.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/computerlanguage.py b/rocrate/model/computerlanguage.py index 19ee99d..0dd8409 100644 --- a/rocrate/model/computerlanguage.py +++ b/rocrate/model/computerlanguage.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/contextentity.py b/rocrate/model/contextentity.py index 8a742dc..6a4040a 100644 --- a/rocrate/model/contextentity.py +++ b/rocrate/model/contextentity.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/creativework.py b/rocrate/model/creativework.py index a4a894d..8c5c9a7 100644 --- a/rocrate/model/creativework.py +++ b/rocrate/model/creativework.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/data_entity.py b/rocrate/model/data_entity.py index 1050854..f17c57c 100644 --- a/rocrate/model/data_entity.py +++ b/rocrate/model/data_entity.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/dataset.py b/rocrate/model/dataset.py index a1d30f0..ce1c12e 100644 --- a/rocrate/model/dataset.py +++ b/rocrate/model/dataset.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/entity.py b/rocrate/model/entity.py index 5be8c47..c18096e 100644 --- a/rocrate/model/entity.py +++ b/rocrate/model/entity.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/file.py b/rocrate/model/file.py index 2aae534..23f0e3e 100644 --- a/rocrate/model/file.py +++ b/rocrate/model/file.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/file_or_dir.py b/rocrate/model/file_or_dir.py index aac31dc..743ac19 100644 --- a/rocrate/model/file_or_dir.py +++ b/rocrate/model/file_or_dir.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/metadata.py b/rocrate/model/metadata.py index a7c86e4..e69750f 100644 --- a/rocrate/model/metadata.py +++ b/rocrate/model/metadata.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/person.py b/rocrate/model/person.py index c3c7766..7bce477 100644 --- a/rocrate/model/person.py +++ b/rocrate/model/person.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/preview.py b/rocrate/model/preview.py index 32d23c0..f39be91 100644 --- a/rocrate/model/preview.py +++ b/rocrate/model/preview.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/root_dataset.py b/rocrate/model/root_dataset.py index 9a4e19c..b7ef59b 100644 --- a/rocrate/model/root_dataset.py +++ b/rocrate/model/root_dataset.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/softwareapplication.py b/rocrate/model/softwareapplication.py index 6a2995f..636d185 100644 --- a/rocrate/model/softwareapplication.py +++ b/rocrate/model/softwareapplication.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/testdefinition.py b/rocrate/model/testdefinition.py index f439c1b..9fb3be0 100644 --- a/rocrate/model/testdefinition.py +++ b/rocrate/model/testdefinition.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/testinstance.py b/rocrate/model/testinstance.py index 8cf8283..0881180 100644 --- a/rocrate/model/testinstance.py +++ b/rocrate/model/testinstance.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/testservice.py b/rocrate/model/testservice.py index 9d3ee59..3b88ee5 100644 --- a/rocrate/model/testservice.py +++ b/rocrate/model/testservice.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/model/testsuite.py b/rocrate/model/testsuite.py index 87114af..2cae478 100644 --- a/rocrate/model/testsuite.py +++ b/rocrate/model/testsuite.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/rocrate.py b/rocrate/rocrate.py index daed143..6b622b8 100644 --- a/rocrate/rocrate.py +++ b/rocrate/rocrate.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/utils.py b/rocrate/utils.py index 512d817..88f827b 100644 --- a/rocrate/utils.py +++ b/rocrate/utils.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rocrate/vocabs.py b/rocrate/vocabs.py index b459bd9..5bdf4df 100644 --- a/rocrate/vocabs.py +++ b/rocrate/vocabs.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,16 +19,28 @@ # See the License for the specific language governing permissions and # limitations under the License. +import sys import json -import pkg_resources +if sys.version_info.minor < 9: + import pkg_resources +else: + import importlib.resources # FIXME: Avoid eager loading? -RO_CRATE = json.loads(pkg_resources.resource_string( - __name__, "data/ro-crate.jsonld" -)) -SCHEMA = json.loads(pkg_resources.resource_string( - __name__, "data/schema.jsonld" -)) +if sys.version_info.minor < 9: + RO_CRATE = json.loads(pkg_resources.resource_string( + __name__, "data/ro-crate.jsonld" + )) + SCHEMA = json.loads(pkg_resources.resource_string( + __name__, "data/schema.jsonld" + )) +else: + RO_CRATE = json.loads( + importlib.resources.files(__package__).joinpath("data/ro-crate.jsonld").read_text("utf8") + ) + SCHEMA = json.loads( + importlib.resources.files(__package__).joinpath("data/schema.jsonld").read_text("utf8") + ) SCHEMA_MAP = dict((e["@id"], e) for e in SCHEMA["@graph"]) diff --git a/setup.py b/setup.py index 2a171b3..fdb62d3 100755 --- a/setup.py +++ b/setup.py @@ -5,6 +5,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -56,10 +57,12 @@ long_description_content_type='text/markdown', long_description=long_description, author=", ".join(( + 'Eli Chadwick', 'Paul De Geest', 'Bert Droesbeke', 'Ignacio Eguinoa', 'Alban Gaignard', + 'Matthias Hörtenhuber', 'Sebastiaan Huber', 'Bruno Kinoshita', 'Simone Leo', diff --git a/test/conftest.py b/test/conftest.py index 1009d1f..f53db2e 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_cli.py b/test/test_cli.py index 28d918e..f8dc96e 100644 --- a/test/test_cli.py +++ b/test/test_cli.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_jsonld.py b/test/test_jsonld.py index aa3b56c..003a3c8 100644 --- a/test/test_jsonld.py +++ b/test/test_jsonld.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_metadata.py b/test/test_metadata.py index 354f432..a0fa489 100644 --- a/test/test_metadata.py +++ b/test/test_metadata.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_model.py b/test/test_model.py index 5c2e086..1935cc8 100644 --- a/test/test_model.py +++ b/test/test_model.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_read.py b/test/test_read.py index 814f008..48be710 100644 --- a/test/test_read.py +++ b/test/test_read.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_readwrite.py b/test/test_readwrite.py index 9be736e..8ffd537 100644 --- a/test/test_readwrite.py +++ b/test/test_readwrite.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_test_metadata.py b/test/test_test_metadata.py index d748255..f5a21a6 100644 --- a/test/test_test_metadata.py +++ b/test/test_test_metadata.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_utils.py b/test/test_utils.py index f22e65d..753373c 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_workflow_ro_crate.py b/test/test_workflow_ro_crate.py index 01ac2d0..a6af528 100644 --- a/test/test_workflow_ro_crate.py +++ b/test/test_workflow_ro_crate.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_write.py b/test/test_write.py index b2be9ab..f748423 100644 --- a/test/test_write.py +++ b/test/test_write.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,6 +21,7 @@ import pytest import os import uuid +import sys import zipfile from itertools import product from urllib.error import URLError @@ -214,6 +216,7 @@ def test_looks_like_file_uri(tmpdir, monkeypatch): assert (out_path / f_name).is_file() +@pytest.mark.skipif(sys.platform == "darwin", reason="FTP opening broken on macOS CI instances") @pytest.mark.slow @pytest.mark.parametrize("fetch_remote", [False, True]) def test_ftp_uri(tmpdir, fetch_remote): diff --git a/tools/add_boilerplate.py b/tools/add_boilerplate.py index 2e6961b..48f3c4b 100644 --- a/tools/add_boilerplate.py +++ b/tools/add_boilerplate.py @@ -3,6 +3,7 @@ # Copyright 2020-2024 Barcelona Supercomputing Center (BSC), ES # Copyright 2020-2024 Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT # Copyright 2022-2024 École Polytechnique Fédérale de Lausanne, CH +# Copyright 2024 Data Centre, SciLifeLab, SE # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -35,6 +36,7 @@ "Barcelona Supercomputing Center (BSC), ES": "2020", "Center for Advanced Studies, Research and Development in Sardinia (CRS4), IT": "2020", "École Polytechnique Fédérale de Lausanne, CH": "2022", + "Data Centre, SciLifeLab, SE": "2024", } THIS_YEAR = str(datetime.date.today().year) BOILERPLATE_START = "Copyright [yyyy] [name of copyright owner]"