Fixing unexpected merge #109
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 3365dfe.
This reverts commit ce22e3f.
This reverts commit d4e1daa.
This reverts commit 0111969.
This reverts commit 2830a66.
This reverts commit f791a93.
This reverts commit c0c5409.
This reverts commit 3122359.
This reverts commit 47b324f.
This reverts commit 29c6090.
This reverts commit 22846e7.
This reverts commit b755a98.
This reverts commit 824437d.
This reverts commit cc73994.
This reverts commit c3e0807.
This reverts commit 5a032df.
This reverts commit 3749b3b.
Bankso
added a commit
that referenced
this pull request
Jun 28, 2024
* build jsonld * Revert "build jsonld" This reverts commit 3365dfe. * Revert "Address typing_extensions issue with ipython" This reverts commit ce22e3f. * Revert "Bump schematic to version 24.5.1" This reverts commit d4e1daa. * Revert "Collate model CSV and convert to JSON-LD" This reverts commit 0111969. * Revert "Update valid values" This reverts commit 2830a66. * Revert "Remove unnecessary double quotes" This reverts commit f791a93. * Revert "Update annotationProperty.csv" This reverts commit c0c5409. * Revert "Removed misspelled Project attribute" This reverts commit 3122359. * Revert "Update shared attributes" This reverts commit 47b324f. * Revert "Remove Project dependency loop" This reverts commit 29c6090. * Revert "Create processLevel.csv" This reverts commit 22846e7. * Revert "Change folder reference for DSP" This reverts commit b755a98. * Revert "Update and add valid value mappings" This reverts commit 824437d. * Revert "Add shared attribute Data Use Codes" This reverts commit cc73994. * Revert "Move dataset valid values to shared" This reverts commit c3e0807. * Revert "Add DUO terms to model as valid values" This reverts commit 5a032df. * Revert "Add initial version of Dataset Sharing Plan model" This reverts commit 3749b3b. --------- Co-authored-by: mc2center-bot[bot] <[email protected]>
Bankso
added a commit
that referenced
this pull request
Jul 2, 2024
* Fixing unexpected merge (#109) * build jsonld * Revert "build jsonld" This reverts commit 3365dfe. * Revert "Address typing_extensions issue with ipython" This reverts commit ce22e3f. * Revert "Bump schematic to version 24.5.1" This reverts commit d4e1daa. * Revert "Collate model CSV and convert to JSON-LD" This reverts commit 0111969. * Revert "Update valid values" This reverts commit 2830a66. * Revert "Remove unnecessary double quotes" This reverts commit f791a93. * Revert "Update annotationProperty.csv" This reverts commit c0c5409. * Revert "Removed misspelled Project attribute" This reverts commit 3122359. * Revert "Update shared attributes" This reverts commit 47b324f. * Revert "Remove Project dependency loop" This reverts commit 29c6090. * Revert "Create processLevel.csv" This reverts commit 22846e7. * Revert "Change folder reference for DSP" This reverts commit b755a98. * Revert "Update and add valid value mappings" This reverts commit 824437d. * Revert "Add shared attribute Data Use Codes" This reverts commit cc73994. * Revert "Move dataset valid values to shared" This reverts commit c3e0807. * Revert "Add DUO terms to model as valid values" This reverts commit 5a032df. * Revert "Add initial version of Dataset Sharing Plan model" This reverts commit 3749b3b. --------- Co-authored-by: mc2center-bot[bot] <[email protected]> * Add initial version of Dataset Sharing Plan model * Add DUO terms to model as valid values * Move dataset valid values to shared * Add shared attribute Data Use Codes * Update and add valid value mappings - update dataset mappings - add DSP mappings - add Data Use Code mapping * Change folder reference for DSP * Create processLevel.csv * Remove Project dependency loop Project Type dependency on Project is not necessary and is flagged by schematic as circular. Removing produces a true directed acyclic graph (DAG) * Update shared attributes * Removed misspelled Project attribute * Update annotationProperty.csv * Remove unnecessary double quotes * Update valid values * Collate model CSV and convert to JSON-LD Schematic 24.5.1 * Bump schematic to version 24.5.1 * Address typing_extensions issue with ipython * build jsonld * Add DataDSP to template generator * Replace XLSX templates with CSV * Update DSP attribute names * Doc updates issue 106 (#111) * Update template refs from xlsx --> csv * Update dataset cv refs to new 'shared' path * Create DataDSP.md * Add valid values md for DSP * Add DSP content to nav config * Rename Dataset Type to Assay For consistency with DatasetView model * Add sharingPlans folder to hooks * Update Dataset Type to Assay in CV mapping * Add DSP Url and update schema definition * Update DataDSP.csv * Add DSP Data Use Codes as attribute Instead of using a single Data Use Codes attribute, differentiate for DSP model. This allows it to show up in our documentation * Update mapping to use DSP Data Use Codes * Add DSP Data Use Codes to vocab section --------- Co-authored-by: mc2center-bot[bot] <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.