Skip to content

Commit

Permalink
bugfix(*): changelog script fixes
Browse files Browse the repository at this point in the history
- restore commented-out line in make_model_changelog that escapes quotes in entity attributes
- fix tag generation in make-mapping_changelog to use correct attributes "key" and "value"
- update called ci-cd to v2.2.10
  • Loading branch information
nelsonwmoore committed Jul 21, 2023
1 parent 67e2ae1 commit 285385e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
ci-cd:
uses: CBIIT/bento-workflows/.github/workflows/ci-cd.yml@v2.2.9
uses: CBIIT/bento-workflows/.github/workflows/ci-cd.yml@v2.2.10
with:
workdir: ./python
pkg_name: bento-meta
Expand Down
7 changes: 4 additions & 3 deletions python/scripts/make_mapping_changelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,20 +125,21 @@ def generate_mapping_cypher(
T(
_plain_var(src_concept),
R(Type="has_tag"),
N(label="tag", props={"mapping_source": mapping_source}),
N(label="tag", props={"key": "mapping_source", "value": mapping_source}),
),
)
dst_concept_path = G(
T(_plain_var(dst_ent), R(Type="has_concept"), dst_concept),
T(
_plain_var(dst_concept),
R(Type="has_tag"),
N(label="tag", props={"mapping_source": mapping_source}),
N(label="tag", props={"key": "mapping_source", "value": mapping_source}),
),
)
new_concept = N(label="concept", props={"_commit": _commit})
new_tag = N(
label="tag", props={"mapping_source": mapping_source, "_commit": _commit}
label="tag",
props={"key": "mapping_source", "value": mapping_source, "_commit": _commit},
)
return Statement(
# find src & dst entities using parent triples
Expand Down
2 changes: 1 addition & 1 deletion python/scripts/make_model_changelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def generate_cypher_to_add_entity(
"""Generates cypher statement to create or merge Entity."""
if entity in cypher_stmts["added_entities"]:
return
# escape_quotes_in_attr(entity)
escape_quotes_in_attr(entity)
cypher_ent = cypherize_entity(entity)
if isinstance(entity, (Term, ValueSet)):
if "_commit" not in cypher_ent.props:
Expand Down

0 comments on commit 285385e

Please sign in to comment.