Skip to content

Commit

Permalink
Merge pull request #132 from microbiomedata/issue-131-7_6_2
Browse files Browse the repository at this point in the history
regen for v7.6.5
  • Loading branch information
turbomam authored Jun 12, 2023
2 parents 6cc5a78 + 2e4c656 commit db0d56d
Show file tree
Hide file tree
Showing 8 changed files with 11,762 additions and 11,117 deletions.
737 changes: 369 additions & 368 deletions poetry.lock

Large diffs are not rendered by default.

28 changes: 15 additions & 13 deletions project.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ modifications_cleanup:
rm -rf sheets_and_friends/yaml_out/with_modifications.yaml

local/nmdc.yaml:
wget -O $@ https://raw.githubusercontent.com/microbiomedata/nmdc-schema/v7.6.0/nmdc_schema/nmdc_materialized_patterns.yaml
wget -O $@ https://raw.githubusercontent.com/microbiomedata/nmdc-schema/v7.6.5/nmdc_schema/nmdc_materialized_patterns.yaml

# sheets-for-nmdc-submission-schema_validation_converter_empty.tsv
local/with_modifications.yaml: local/with_shuttles_yq.yaml \
Expand Down Expand Up @@ -292,16 +292,17 @@ src/data/invalid src/data/valid
--output-directory $(dir $@) \
--schema $< > $@

# target was was local/slot_usage.tsv,
# but I changed the destination to a checked-in directory
# so collaborators can sort and filter the slot attributes
# and I switched to a smaller template
schemasheets/populated_tsv/slot_usage_minimal.tsv: src/nmdc_submission_schema/schema/nmdc_submission_schema.yaml \
schemasheets/templates/slot_usage_minimal.tsv
$(RUN) linkml2sheets \
--output-directory $(dir $@) \
--schema $< $(word 2,$^)
# WARNING:root:Not implemented: slot
# see local/usage_template.tsv
## target was was local/slot_usage.tsv,
## but I changed the destination to a checked-in directory
## so collaborators can sort and filter the slot attributes
## and I switched to a smaller template
#schemasheets/populated_tsv/slot_usage_minimal.tsv: src/nmdc_submission_schema/schema/nmdc_submission_schema.yaml \
#schemasheets/templates/slot_usage_minimal.tsv
# $(RUN) linkml2sheets \
# --output-directory $(dir $@) \
# --schema $< $(word 2,$^)
## WARNING:root:Not implemented: slot

local/SampleData-water-data-exhaustive.tsv: src/nmdc_submission_schema/schema/nmdc_submission_schema.yaml \
src/data/valid/SampleData-water-data-exhaustive.yaml
Expand Down Expand Up @@ -502,13 +503,14 @@ bz-one-off-jsonschema-validations: project/jsonschema/nmdc_submission_schema.sch
--schemafile $< src/data/invalid/SampleData-jgi_mt_data-illegal-rna_sample_format.yaml


# --columns-to-insert enum \
# --columns-to-insert permissible_value \
local/usage_template.tsv: src/nmdc_submission_schema/schema/nmdc_submission_schema.yaml
mkdir -p $(@D)
$(RUN) generate_and_populate_template \
--base-class slot_definition \
--columns-to-insert class \
--columns-to-insert enum \
--columns-to-insert permissible_value \
--columns-to-insert slot \
--destination-template $@ \
--meta-model-excel-file local/meta.xlsx \
Expand Down
Loading

0 comments on commit db0d56d

Please sign in to comment.