Skip to content

Commit

Permalink
Merge branch 'main' into issue-291-mixs-submod
Browse files Browse the repository at this point in the history
merge from main
  • Loading branch information
turbomam committed May 13, 2022
2 parents 7b9303d + f2f7ec3 commit 6e47d83
Show file tree
Hide file tree
Showing 35 changed files with 37,529 additions and 2,644 deletions.
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,19 @@ post_test: clean mixs_clean reports/slot_annotations_diffs.tsv all
poetry run python biosamples_from_NMDC_api.py
# todo add check over omics processings too?

reference_commit=dbbf2f85b676daa35af78992c2649a68457cae21
# main
# release 3.2.0 = dbbf2f85b676daa35af78992c2649a68457cae21

mixs_clean:
rm -rf reports/slot_annotations_diffs.tsv
rm -rf reports/slot_diffs.yaml
rm -rf reports/slot_roster.tsv
rm -rf src/schema/mixs*yaml
curl -o src/schema/mixs.yaml https://raw.githubusercontent.com/microbiomedata/nmdc-schema/main/src/schema/mixs.yaml
curl -o src/schema/nmdc.yaml https://raw.githubusercontent.com/microbiomedata/nmdc-schema/main/src/schema/nmdc.yaml
curl -o nmdc_schema/nmdc.py https://raw.githubusercontent.com/microbiomedata/nmdc-schema/main/nmdc_schema/nmdc.py
# ensure that we are comparing against the current main
# not some local junk
# OR could compare against some other branch, commit, etc.
curl -o src/schema/mixs.yaml https://raw.githubusercontent.com/microbiomedata/nmdc-schema/$(reference_commit)/src/schema/mixs.yaml
curl -o src/schema/nmdc.yaml https://raw.githubusercontent.com/microbiomedata/nmdc-schema/$(reference_commit)/src/schema/nmdc.yaml
curl -o nmdc_schema/nmdc.py https://raw.githubusercontent.com/microbiomedata/nmdc-schema/$(reference_commit)/nmdc_schema/nmdc.py
cp src/schema/mixs.yaml src/schema/mixs_legacy.yaml
20 changes: 0 additions & 20 deletions Pipfile

This file was deleted.

1,672 changes: 0 additions & 1,672 deletions Pipfile.lock

This file was deleted.

48 changes: 0 additions & 48 deletions assets/person_value.yaml

This file was deleted.

Loading

0 comments on commit 6e47d83

Please sign in to comment.