Skip to content

Revert "Revert "Merge branch 'f-extend-yaml-model' into 'dev'""

Florian Spreckelsen requested to merge f-extend-yaml-model into dev

Summary

For #72 (closed). Repairs the previous MR which introduced the role and value keywords into the yaml model.

Focus

For the actual changes after the reversion of the revert, have a look at https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools/-/merge_requests/36/diffs?diff_id=5835&start_sha=619c25e6214aaeb5f91f10252a8dda104b0e46b5. Note that role: File is postponed until later (#74), as is the implementation of the valued_properties keyword (#75).

Test Environment

New unit tests and integration tests (use with the debug profile of caosdb-deploy as described in README_SETUP.md). Depending on your level of paranoia, you can also test it with the AWI server profile:

  1. Check out server-profile in local-testing-main and update (and init, if necessary) the integration test submodule.
  2. Run integration-tests/tests/test.sh

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

  • All automated tests pass
  • Reference related issues
  • Up-to-date CHANGELOG.md (or not necessary)
  • Annotations in code (Gitlab comments)
    • Intent of new code
    • Problems with old code
    • Why this implementation?

Check List for the Reviewer

  • I understand the intent of this MR
  • All automated tests pass
  • Up-to-date CHANGELOG.md (or not necessary)
  • The test environment setup works and the intended behavior is reproducible in the test environment
  • In-code documentation and comments are up-to-date.
  • Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

Edited by Daniel Hornung

Merge request reports

Loading