Skip to content
Snippets Groups Projects

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

Merged Revert "Revert "Merge branch 'f-extend-yaml-model' into 'dev'""
f-extend-yaml-model into dev
1 unresolved thread
Merged Florian Spreckelsen requested to merge f-extend-yaml-model into dev
1 unresolved thread

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

Pipeline #20745 passed

Stage: setup
Stage: cert
Stage: style
Stage: unittest
Stage: integrationtest

Pipeline passed for 217bbaf2 on f-extend-yaml-model

Approval is optional

Merged by Florian SpreckelsenFlorian Spreckelsen 3 years ago (Mar 23, 2022 2:46pm UTC)

Loading

Pipeline #21031 passed

Stage: setup
Stage: cert
Stage: style
Stage: unittest
Stage: integrationtest

Pipeline passed for 78c738ed on dev

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
src/caosadvancedtools/models/parser.py
297 320 continue
298 321 n = self._stringify(n)
299 322
300 if (isinstance(e, dict) and "datatype" in e
301 and (_get_listdatatype(e["datatype"]) is not None)):
302 self.model[ent_name].add_property(
303 name=n,
304 importance=importance,
305 datatype=db.LIST(_get_listdatatype(e["datatype"])))
323 if isinstance(e, dict):
  • Florian Spreckelsen
  • Florian Spreckelsen
  • Florian Spreckelsen requested review from @salexan

    requested review from @salexan

  • Florian Spreckelsen added 1 commit

    added 1 commit

    • 36e27fb0 - MAINT: Disable `role: File` for now in parser

    Compare with previous version

  • Florian Spreckelsen added 1 commit

    added 1 commit

    • e41160a5 - MAINT: Refactor and simplify adding of properties

    Compare with previous version

  • Florian Spreckelsen marked the checklist item All automated tests pass as completed

    marked the checklist item All automated tests pass as completed

  • Florian Spreckelsen marked the checklist item Reference related issues as completed

    marked the checklist item Reference related issues as completed

  • Florian Spreckelsen marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

    marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

  • Florian Spreckelsen added 1 commit

    added 1 commit

    • 3b483d65 - DOC: Update integration test setup to new profile name

    Compare with previous version

  • Florian Spreckelsen changed the description

    changed the description

  • Florian Spreckelsen marked the checklist item Annotations in code (Gitlab comments) as completed

    marked the checklist item Annotations in code (Gitlab comments) as completed

  • Florian Spreckelsen removed review request for @salexan

    removed review request for @salexan

  • Daniel Hornung added 2 commits

    added 2 commits

    • 0e2a2c52 - MAINT: Allow lines of length 100
    • 217bbaf2 - DOC: Added docstring, fixed a few typos.

    Compare with previous version

  • Daniel Hornung marked the checklist item I understand the intent of this MR as completed

    marked the checklist item I understand the intent of this MR as completed

  • Daniel Hornung marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

    marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

  • Daniel Hornung marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as completed

    marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as completed

  • Daniel Hornung marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as incomplete

    marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as incomplete

  • Daniel Hornung marked the checklist item In-code documentation and comments are up-to-date. as completed

    marked the checklist item In-code documentation and comments are up-to-date. as completed

  • Daniel Hornung approved this merge request

    approved this merge request

  • Florian Spreckelsen merged

    merged

  • Florian Spreckelsen mentioned in commit 78c738ed

    mentioned in commit 78c738ed

    • Please register or sign in to reply