diff --git a/.github/workflows/render-readme.yaml b/.github/workflows/render-readme.yaml index 4015c1aa..9f2ed226 100644 --- a/.github/workflows/render-readme.yaml +++ b/.github/workflows/render-readme.yaml @@ -1,19 +1,20 @@ -on: - push: - paths: - - README.md - +--- name: Render README +on: + push: + paths: + - README.md + jobs: - render: - name: Render README - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Render README - run: tools/render-readme.sh - - name: Commit results - run: | - git commit README.md -m 'Render README.md' || echo "No changes to commit" - git push origin || echo "No changes to commit" + render: + name: Render README + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Render README + run: tools/render-readme.sh + - name: Commit results + run: | + git commit README.md -m 'Render README.md' || echo "No changes to commit" + git push origin || echo "No changes to commit" diff --git a/.github/workflows/requirements.txt b/.github/workflows/requirements.txt new file mode 100644 index 00000000..e079f8a6 --- /dev/null +++ b/.github/workflows/requirements.txt @@ -0,0 +1 @@ +pytest diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 17966c57..c9233b87 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -1,26 +1,32 @@ -on: push - +--- name: Run tests +on: + push: + branches: + - master + pull_request: + jobs: tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - name: Use Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: '3.8' + - uses: actions/checkout@v3 - - name: Update package index - run: sudo apt-get update + - name: Use Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' + cache: pip + cache-dependency-path: .github/workflows/requirements.txt - - name: Install xmllint - run: sudo apt-get install -y libxml2-utils + - name: Install xmllint + run: | + sudo apt install --yes libxml2-utils + xmllint --version - - name: Install requirements - run: pip install pytest + - name: Install requirements + run: pip install -r .github/workflows/requirements.txt - - name: Run tests - run: pytest + - name: Run tests + run: pytest diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 00000000..312b1f38 --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,119 @@ +cff-version: 1.1.0 + +message: If you refer to this content in a publication, please cite it as below. +title: Content for Research Data Management Organizer (RDMO) +doi: 10.5281/zenodo.596706 +license: CC0 1.0 Universal +repository-code: https://github.com/rdmorganiser/rdmo-catalog + +authors: + - family-names: Michaelis + given-names: Olaf + orcid: https://orcid.org/0000-0002-5282-703X + - family-names: Klar + given-names: Jochen + orcid: https://orcid.org/0000-0002-5883-4273 + - family-names: Grossmann + given-names: Yves Vincent + orcid: https://orcid.org/0000-0002-2880-8947 + - family-names: Höhner + given-names: Kathrin + orcid: https://orcid.org/0000-0002-3988-7839 + - family-names: Windeck + given-names: Jürgen + orcid: https://orcid.org/0000-0003-1909-4353 + - family-names: Lanza + given-names: Giacomo + orcid: https://orcid.org/0000-0002-2239-3955 + - family-names: Meier + given-names: Laura + orcid: https://orcid.org/0000-0003-1368-2306 + - family-names: Schönau + given-names: Sabine + orcid: + - family-names: Richter + given-names: Thomas + orcid: https://orcid.org/0009-0005-7168-7959 + - family-names: Riedel + given-names: Roman + orcid: + - family-names: Rodríguez + given-names: Laura + orcid: https://orcid.org/0000-0002-1446-2199 + - family-names: Rühle + given-names: Frank + orcid: https://orcid.org/0000-0001-7688-2394 + - family-names: Frenzel + given-names: Johannes + orcid: https://orcid.org/0000-0003-0458-5424 + - family-names: Schröder + given-names: Clara + orcid: + - family-names: Terzijska + given-names: Džulia + orcid: https://orcid.org/0000-0002-1698-6826 + - family-names: Wallace + given-names: David + orcid: https://orcid.org/0000-0001-8958-4601 + - family-names: Spenger + given-names: Martin + orcid: https://orcid.org/0000-0002-8841-5985 + - family-names: Wettermann + given-names: Sarah + orcid: https://orcid.org/0009-0006-5838-095X + - family-names: Rothe + given-names: Robin + orcid: https://orcid.org/0000-0003-3688-6942 + - family-names: Sinn + given-names: Christoph + orcid: https://orcid.org/0000-0003-0275-1070 + - family-names: Rathmann + given-names: Torsten + orcid: https://orcid.org/0000-0001-5880-1546 + - family-names: Sutter + given-names: Paul + orcid: https://orcid.org/0000-0002-9883-0680 + - family-names: Hasler + given-names: Tim + orcid: https://orcid.org/0000-0001-9164-3500 + + - family-names: Cardenas + given-names: Yonny + orcid: + - family-names: Grasso Toro + given-names: Federico + orcid: https://orcid.org/0000-0002-9041-0868 + - family-names: Lanza + given-names: Margherita + orcid: + - family-names: Linares + given-names: Jimena + orcid: https://orcid.org/0000-0003-3847-2663 + - family-names: Marmin + given-names: Sébastien + orcid: + - family-names: Martínez Muñoz + given-names: David + orcid: + - family-names: Piette + given-names: Anne-Sophie + orcid: https://orcid.org/0000-0002-7876-1251 + - family-names: Pilori + given-names: Dario + orcid: https://orcid.org/0000-0003-4499-8573 + + - family-names: Engelhardt + given-names: Claudia + orcid: https://orcid.org/0000-0002-3391-7638 + - family-names: Freund + given-names: Jens + orcid: https://orcid.org/0000-0001-6232-7568 + - family-names: Hendricks + given-names: Sonja + orcid: + - family-names: Lemaire + given-names: Marina + orcid: https://orcid.org/0000-0003-4726-2481 + - family-names: Straka + given-names: Janine + orcid: https://orcid.org/0000-0002-0695-1689 diff --git a/README.md b/README.md index 7e6e989f..a8da097b 100644 --- a/README.md +++ b/README.md @@ -12,42 +12,57 @@ Different scripts are located in `tools`. These are interesting for people maint ## Issues -If you encounter any problems with the questionaires, the domain model, or other content of this repository, please file an issue here: https://github.com/rdmorganiser/rdmo-catalog/issues. +If you encounter any problems with the questionnaires, the domain model, or other content of this repository, please file an issue here: https://github.com/rdmorganiser/rdmo-catalog/issues. For problems or bugs with the RDMO Software, please use the issues in the [rdmo](https://github.com/rdmorganiser/rdmo) repository: https://github.com/rdmorganiser/rdmo/issues. In order to file issues, you will need a GitHub account. ## Content curated by the RDMO team -| Coverage (funder, subject, geographical region) | File / Creators | Last update | -| ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ----------- | -| All questions (long) | [RDMO team](rdmorganiser/questions/rdmo.xml) | 2016 | -| All questions (short) | [RDMO team](rdmorganiser/questions/fhpshort.xml) | 2018 | -| DFG checklist | [RDMO team](rdmorganiser/questions/DFG-Checkliste.xml) | 11/2022 | -| Horizon Europe | **catalog:** [RDMO team](rdmorganiser/questions/horizon-europe.xml)
**view:** [RDMO team](rdmorganiser/views/horizon-europe.xml) | 12/2022 | -| Swiss National Fund | [RDMO team](rdmorganiser/questions/snf.xml) | 2018 | -| DCC checklist | [RDMO team](rdmorganiser/questions/dcc.xml) | 10/2018 | -| Software Management Plan | [RDMO team](rdmorganiser/questions/SMP-Questions.xml) | 06/2023 | +|Subject/Coverage |Catalog |View |Last update |Creators | +|------------------------|----------------------------------------------------|-----|------------|----------| +|All questions (long) |[catalog](rdmorganiser/questions/rdmo.xml) | |2020-08|RDMO team | +|All questions (short) |[catalog](rdmorganiser/questions/fhpshort.xml) | |2020-08|FHP / RDMO team| +|DCC checklist |[catalog](rdmorganiser/questions/dcc.xml) | |2018-10|RDMO team | +|DFG checklist |[catalog](rdmorganiser/questions/DFG-Checkliste.xml)|[view](rdmorganiser/views/dfg-checkliste.xml) |2023-11|RDMO team | +|Horizon Europe |[catalog](rdmorganiser/questions/horizon-europe.xml)|[view](rdmorganiser/views/horizon-europe.xml) |2022-12|RDMO team | +|Software Management Plan|[catalog](rdmorganiser/questions/SMP-Questions.xml) |[view (FAIR4RS)](rdmorganiser/views/FAIR4RSview.xml)|2023-08|MPDL / RDMO team| +|Swiss National Fund |[catalog](rdmorganiser/questions/snf.xml) |[view](rdmorganiser/views/snf.xml) |2020-08|RDMO team | +|Bielefeld | |[view](rdmorganiser/views/bielefeld.xml) |2019-01|RDMO team | +|CITEC | |[view](rdmorganiser/views/citec.xml) |2019-01|RDMO team | +|Costs | |[view](rdmorganiser/views/costs.xml) |2022-08|RDMO team | +|DMPonline | |[view](rdmorganiser/views/dmponline.xml) |2019-01|RDMO team | +|DMPtool | |[view](rdmorganiser/views/dmptool.xml) |2019-01|RDMO team | +|Horizon 2020 | |[view](rdmorganiser/views/horizon2020.xml) |2019-01|RDMO team | +|All variables (to check)| |[view](rdmorganiser/views/variable_check.xml)|2022-12|RDMO team | ## Other content provided by the user community -| Coverage (funder, subject, geographical region) | File / Creators | Last update | -| ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- | -| All questions (long) | [FoDaKo](shared/fodako/all_5.xml) | 2016 | -| DFG checklist | [FoDaKo](shared/fodako/dfg_5.xml) | 11/2022 | -| DFG Biodiversity research | [FoDaKo](shared/fodako/biodiversity_dfg_5.xml) | 11/2022 | -| DFG Chemistry | [FoDaKo](shared/fodako/chem_dfg_5.xml)
[FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/dfg-chemie/dfg_Chemie.xml ) | 12/2022 | -| DFG 101 Ancient Cultures | [FoDaKo](shared/fodako/101_dfg_5.xml)
[FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/dfg-alte-kulturen/dfg_alte_kulturen_fk101.xml) | 11/2022 | -| DFG 104 Spoken corpus | [FoDaKo](shared/fodako/spokencorpus_dfg_5.xml) | 11/2022 | -| DFG 104 Text corpus | [FoDaKo](shared/fodako/textcorpus_dfg_5.xml) | 11/2022 | -| DFG 105 Editions | [FoDaKo](shared/fodako/edition_dfg_5.xml)
[FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/dfg-editionen/dfg_editions.xml) | 11/2022 | -| DFG 106 Social & Cultural Anthropology [...] | [FoDaKo](shared/fodako/106_dfg_5.xml)
[FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/dfg-sozkulttheo/dfg_sozkulttheo_fk106.xml) | 11/2022 | -| DFG 109 Educational Research | [FoDaKo](shared/fodako/109_dfg_5.xml) | 11/2022 | -| DFG 112 Economics | [FoDaKo](shared/fodako/112_dfg_5.xml) | 11/2022 | -| Emissions in animal husbandry | [EmiMin](shared/EmiMin/publisso_terms4life_emiminV1_questions.xml)
[EmiMin (lead)](shared/EmiMin/publisso_terms4life_emimin_lead_V1_questions.xml) | | -| Hessen State | [HeFDI](shared/HeFDI/4_hefdi_template_questions_1.4.xml) | | -| Horizon 2020 | **catalog:** [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/h2020-ehum/ehum_h2020_fragebogen.xml)
**view:** [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/h2020-ehum/views_h2020.xml) | | -| Mathematics | [DFG Excellence Cluster MATH+](shared/MATH+/mathplus_questions.xml) | 11/2022 | -| Mechanical Engineering | [NFDI4Ing](shared/nfdi4ing/rdmo_mechanical_engineering/catalog_mb_20190124.xml) | | | | -| VW Foundation - Science Europe | [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/ScienceEurope_VW_Stiftung/catalog_VW_SE.xml) | | - -29 catalogs shared +|Subject/Coverage |Catalog |View|Last update |Creators | +|-------------------------|-----------------------------------------------|----|------------|----------| +|All questions (RDMO+DFG) |[catalog](shared/fodako/all_5.xml) | |2022-03|FoDaKo | +|BLE |[catalog](shared/BLE_JKI/) |[view](shared/BLE_JKI/)|2023-10|Julius-Kühn-Institut| +|DFG checklist |[catalog](shared/fodako/dfg_5.xml) | |2022-03|FoDaKo | +|DFG Biodiversity research|[catalog](shared/fodako/biodiversity_dfg_5.xml)| |2022-03|FoDaKo | +|DFG Chemistry |[catalog](shared/fodako/chem_dfg_5.xml) | |2022-03|FoDaKo | +|DFG Chemistry |[catalog](shared/ub_fau_erlangen_nuernberg/dfg-chemie/dfg_Chemie.xml)||2023-08|FDM Bayern eHumanities| +|DFG Physics |[catalog](shared/ub_fau_erlangen_nuernberg/dfg-physik/dfg_Physik.xml)||2023-08|FDM Bayern eHumanities| +|DFG 101 Ancient Cultures |[catalog](shared/ub_fau_erlangen_nuernberg/dfg-alte-kulturen/dfg_alte_kulturen_fk101.xml)||2020-09|FDM Bayern eHumanities| +|DFG 101 Ancient Cultures |[catalog](shared/fodako/101_dfg_5.xml) | |2022-03|FoDaKo| +|DFG 104 Spoken corpus |[catalog](shared/fodako/spokencorpus_dfg_5.xml)| |2022-03|FoDaKo| +|DFG 104 Text corpus |[catalog](shared/fodako/textcorpus_dfg_5.xml) | |2022-03|FoDaKo| +|DFG 105 Editions |[catalog](shared/fodako/edition_dfg_5.xml) | |2022-03|FoDaKo| +|DFG 105 Editions |[catalog](shared/ub_fau_erlangen_nuernberg/dfg-editionen/dfg_editions.xml)||2020-09|FDM Bayern eHumanities| +|DFG 106 Social & Cultural Anthropology|[catalog](shared/ub_fau_erlangen_nuernberg/dfg-sozkulttheo/dfg_sozkulttheo_fk106.xml)||2020-09|FDM Bayern eHumanities| +|DFG 106 Social & Cultural Anthropology|[catalog](shared/fodako/106_dfg_5.xml)||2022-03|FoDaKo| +|DFG 109 Educational Research |[catalog](shared/fodako/109_dfg_5.xml)||2022-03|FoDaKo| +|DFG 112 Economics |[catalog](shared/fodako/112_dfg_5.xml) ||2022-03|FoDaKo| +|ERC grants |[catalog](shared/ub_fau_erlangen_nuernberg/erc-grants/erc.xml)||2023-08|FDM Bayern eHumanities| +|Emissions in animal husbandry|[catalog 1](shared/EmiMin/publisso_terms4life_emiminV1_questions.xml)
[catalog 2](shared/EmiMin/publisso_terms4life_emimin_lead_V1_questions.xml)||2021-04|EmiMin| +|Hessen State |[catalog](shared/HeFDI/4_hefdi_template_questions_1.4.xml)||2020-07|HeFDI| +|Horizon 2020 |[catalog](shared/ub_fau_erlangen_nuernberg/h2020-ehum/ehum_h2020_fragebogen.xml)|[view](shared/ub_fau_erlangen_nuernberg/h2020-ehum/views_h2020.xml)|2020-09|FDM Bayern eHumanities| +|Mathematics |[catalog](shared/MATH+/mathplus_questions.xml) ||2022-11|DFG Excellence Cluster MATH+| +|Mechanical Engineering |[catalog](shared/nfdi4ing/rdmo_mechanical_engineering/catalog_mb_20190124.xml)||2023-06|NFDI4Ing| +|Research data policy generator|[catalog](shared/FDNext/) ||2023-11|FDNext| +|VW Foundation - Science Europe|[catalog](shared/ub_fau_erlangen_nuernberg/ScienceEurope_VW_Stiftung/catalog_VW_SE.xml)||2021-04|FDM Bayern eHumanities| + +Total: 33 catalogs, 13 views diff --git a/rdmorganiser/conditions/rdmo.xml b/rdmorganiser/conditions/rdmo.xml index 905b06ac..ca0ff97f 100644 --- a/rdmorganiser/conditions/rdmo.xml +++ b/rdmorganiser/conditions/rdmo.xml @@ -18,6 +18,15 @@ 1 + + https://rdmorganiser.github.io/terms/ + data_published + + + eq + + + https://rdmorganiser.github.io/terms data_sharing @@ -117,6 +126,15 @@ + + https://rdmorganiser.github.io/terms + reuse_scenario + + + neq + + + https://rdmorganiser.github.io/terms rights_owner_clear diff --git a/rdmorganiser/domain/rdmo.xml b/rdmorganiser/domain/rdmo.xml index 065e1bfc..a942e05e 100644 --- a/rdmorganiser/domain/rdmo.xml +++ b/rdmorganiser/domain/rdmo.xml @@ -1869,10 +1869,10 @@ introduced by the Max Planck Digital Library to implement the Software Management Plan - + https://rdmorganiser.github.io/terms/ - re-usable - smp/re-usable + qualified-references + smp/qualified-references introduced by the Max Planck Digital Library to implement the Software Management Plan diff --git a/rdmorganiser/options/rdmo.xml b/rdmorganiser/options/rdmo.xml index 8315e4ab..e4af3785 100644 --- a/rdmorganiser/options/rdmo.xml +++ b/rdmorganiser/options/rdmo.xml @@ -2660,7 +2660,7 @@ Sí Oui Sì - True + False