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

Iteration on SMP to better scale by size of software project #244

Merged
merged 31 commits into from
Jan 26, 2024
Merged

Iteration on SMP to better scale by size of software project #244

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
dcd00bf
Introduce software application classes into the SMP catalogue
yvgrossmann Nov 29, 2023
9b8de7e
Update application class question in SMP with style features
yvgrossmann Nov 29, 2023
dfb483c
Add conditions on software application classes into the SMP catalogue
yvgrossmann Nov 29, 2023
9756484
Add requests from NFDI4Ing
yvgrossmann Nov 29, 2023
6684274
Update version in SMP catalogue
yvgrossmann Nov 30, 2023
e1402c9
Added conditions for application classes for the SMP catalogue
yvgrossmann Nov 30, 2023
084a119
Merge branch 'rdmorganiser:master' into nfdi4ds-hackathon-2023
yvgrossmann Nov 30, 2023
eab1e49
Corrections of RDMO 1.X to 2.0 in options and conditions for SMP cata…
yvgrossmann Nov 30, 2023
81d62f6
Merge branch 'nfdi4ds-hackathon-2023' of https://github.com/yvgrossma…
yvgrossmann Nov 30, 2023
1d2a5fb
change textarea to text for language and license
jwindeck Nov 30, 2023
5421618
remove condition class 1 from specification document
jwindeck Nov 30, 2023
af6b52a
Add new options for software licenses
yvgrossmann Dec 4, 2023
c0dd422
Edit question in SMP regarding software license
yvgrossmann Dec 4, 2023
97978c0
Merge branch 'rdmorganiser:master' into nfdi4ds-hackathon-2023
yvgrossmann Dec 4, 2023
ea12d8e
add optionset software identifier
jwindeck Dec 4, 2023
5546fec
fix for software identifier optionsets
jwindeck Dec 4, 2023
7875d9f
Korrekturen Optionen
Dec 6, 2023
354d47c
Hierarchie Optionensatz/Option reetabliert
Zack-83 Dec 6, 2023
8358a9b
Add crosswalk document for SMP to readme file
yvgrossmann Dec 7, 2023
401e73e
add DOI for maSMP hackathon by NFDI4DS and ZB Med in readme
yvgrossmann Dec 14, 2023
13d99b8
improve standalone template and crosswalk
Zack-83 Dec 19, 2023
c7cd8d0
make content compatible with RDMO 1.x; minor corrections also for 2.0
Zack-83 Dec 19, 2023
3972d3c
Merge branch 'nfdi4ds-hackathon-2023' of https://github.com/yvgrossma…
Zack-83 Dec 19, 2023
bc27f94
Correct Apache 2.0 option
yvgrossmann Dec 21, 2023
971154a
complete paths within optionset /software-license
Zack-83 Dec 21, 2023
018a269
term --> terms
Zack-83 Dec 21, 2023
1b18780
Update rdmo_options_new_SMP_for_RDMO-1.x.xml
Zack-83 Dec 21, 2023
e272b32
fix minor typos in SMP question xmi
yvgrossmann Jan 18, 2024
122e5a5
Update SMP readme with SMP metadata
yvgrossmann Jan 23, 2024
9371066
adapt PR for RDMO 1.x
Jan 23, 2024
542b22c
correct initial tag
Zack-83 Jan 26, 2024
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ For problems or bugs with the RDMO Software, please use the issues in the [rdmo]
|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|
|Software Management Plan|[catalog](rdmorganiser/questions/SMP-Questions.xml) |[view (FAIR4RS)](rdmorganiser/views/FAIR4RSview.xml)|2023-11|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 |
Expand Down
27 changes: 27 additions & 0 deletions rdmorganiser/conditions/rdmo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,31 @@
<target_text/>
<target_option dc:uri="https://rdmorganiser.github.io/terms/options/software_versioning_technology_options/164"/>
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/application-class-1">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>application-class-1</key>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/smp/application-class"/>
<relation>eq</relation>
<target_text/>
<target_option dc:uri="https://rdmorganiser.github.io/terms/options/application-class-1"/>
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/application-class-2">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>application-class-2</key>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/smp/application-class"/>
<relation>eq</relation>
<target_text/>
<target_option dc:uri="https://rdmorganiser.github.io/terms/options/application-class-2"/>
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/application-class-3">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>application-class-3</key>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/smp/application-class"/>
<relation>eq</relation>
<target_text/>
<target_option dc:uri="https://rdmorganiser.github.io/terms/options/application-class-3"/>
</condition>
</rdmo>
7 changes: 7 additions & 0 deletions rdmorganiser/domain/rdmo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,4 +2030,11 @@
<dc:comment>introduced by the Max Planck Digital Library to implement the Software Management Plan</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/smp"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/smp/application-class">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>application-class</key>
<path>smp/application-class</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/smp"/>
</attribute>
</rdmo>
2 changes: 1 addition & 1 deletion rdmorganiser/options/rdmo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7304,4 +7304,4 @@
<text lang="it">...</text>
<additional_input>True</additional_input>
</option>
</rdmo>
</rdmo>
Loading