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.

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

Conflict resolved backmerge #181

Merged
merged 113 commits into from
Jun 4, 2024
Merged

Conflict resolved backmerge #181

merged 113 commits into from
Jun 4, 2024

Conversation

turbomam
Copy link
Member

@turbomam turbomam commented May 30, 2024

No description provided.

aclum and others added 30 commits May 13, 2024 17:02
Update range for was_informed_by
Add slot usage for was_informed_by to add structured_syntax
Remove structured_pattern on was_informed_by until re-iding is complete.
…ase-class-has-two-slots-named-functional_annotation_agg

deduplicate Database slots
…ublish-action-version

Do not pin to a specific version of pypa/gh-action-pypi-publish
…ublish-action-version-part-2

Fix version specifier for pypa/gh-action-pypi-publish
…xamples to test id pattern constraints, update id_version pattern match to enforce it as a single dot followed by a digit
@turbomam turbomam marked this pull request as ready for review June 4, 2024 19:43
@turbomam turbomam requested review from aclum and mslarae13 June 4, 2024 19:43
has_output:
- nmdc:22afa3d49b73eaec2e9787a6b88fbdc3
- generic:xxx
Copy link
Collaborator

@aclum aclum Jun 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@turbomam generic:xxx should not be allowed. has_output should have a structured pattern for a data object value here. In some cases this is currently populated with None which cause ref integrity issues so we'll need to allow that for now too. This means we missed fixing this class in nmdc-schema.

src/schema/nmdc.yaml Outdated Show resolved Hide resolved
interpolated: true
has_input:
structured_pattern:
syntax: "{id_nmdc_prefix}:(bsm|procsm)-{id_shoulder}-{id_blade}$"
interpolated: true
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we are missing an has_output pattern. This should be a DataObject or 'None' (to accommodate existing data in mongo)

@turbomam turbomam merged commit 4ecd4fd into main Jun 4, 2024
2 checks passed
@turbomam turbomam deleted the conflict-resolved-backmerge branch June 5, 2024 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants