Closed AlanSimmons closed 3 weeks ago
@AlanSimmons I noticed that you had merged dev-integrate
branch into this feature branch, which is NOT the workflow we've been following. We don't want to introduce any commits from dev-integrate
into main
later. Can you fix it?
@yuanzhou Bill asked me to merge changes from his branch (https://github.com/x-atlas-consortia/hs-ontology-api/tree/shirey/updated-assay-classes) in dev-integrate back into my dev branch. The dev server isn't supposed to be in prod.
HIs change is just one file--the ontologies.json. Would it just be easier to cancel this PR, copy over that one file to my branch, and then submit a new PR?
@AlanSimmons looks like Bill branched off dev-integrate
since he only needed to update that json file. That introduced all the commit history from dev-integrate
.
The easiest thing you can do--without messing up with git commands--is to branch off the latest main
then reapply all your code updates along with the json updates by copying from this jas/assayclasses_optional_hierarchy
to the new branch. Then we'll close this PR once you have the new PR.
Replaced by #150
a. The measurement_assay concept hierarchy has been unlinked from the assay classification. b. The contains_full_genetic_sequences property is now at the level of the assay classification, instead of at the level of the legacy measurement_assay.
The assayclasses endpoint now features an optional provide-hierarchy-info parameter. If true, the endpoint includes hierarchy information for dataset_type; if false, the endpoint only returns the dataset_type.
Changes to the dev assayclasses.json from the shirey/updated-assay-classes branch were merged to this branch.
The response from the assayclasses endpoint is now synchronized with the development assayclasses.json.