diff --git a/.github/workflows/publish-schemata.yml b/.github/workflows/publish-schemata.yml index cef881d62..7280031c3 100644 --- a/.github/workflows/publish-schemata.yml +++ b/.github/workflows/publish-schemata.yml @@ -41,7 +41,7 @@ jobs: - name: Commit changes run: | git add releases - if ! git diff --quiet + if ! git diff --quiet --cached then git commit -m "Publish model schemata as of dandi-cli $(git -C ../dandi describe --tags)" git push else echo "No changes to commit" diff --git a/CHANGELOG.md b/CHANGELOG.md index 04b4a393d..3fee3eaff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +# 0.8.0 (Tue Dec 01 2020) + +#### 🚀 Enhancement + +- Add rudimentary duecredit support using zenodo's dandi-cli DOI [#285](https://github.com/dandi/dandi-cli/pull/285) ([@yarikoptic](https://github.com/yarikoptic)) + +#### 🐛 Bug Fix + +- BF: add h5py.__version__ into the list of tokens for caching [#284](https://github.com/dandi/dandi-cli/pull/284) ([@yarikoptic](https://github.com/yarikoptic)) +- change from disease to disorder [#291](https://github.com/dandi/dandi-cli/pull/291) ([@satra](https://github.com/satra)) + +#### 🏠 Internal + +- Fix publish-schemata workflow [#290](https://github.com/dandi/dandi-cli/pull/290) ([@jwodder](https://github.com/jwodder)) +- updated just models [#287](https://github.com/dandi/dandi-cli/pull/287) ([@satra](https://github.com/satra)) +- Add workflow for publishing model schemata to dandi/schema [#276](https://github.com/dandi/dandi-cli/pull/276) ([@jwodder](https://github.com/jwodder)) +- DOC: strip away duplicate with the handbook information [#279](https://github.com/dandi/dandi-cli/pull/279) ([@yarikoptic](https://github.com/yarikoptic)) + +#### Authors: 3 + +- John T. Wodder II ([@jwodder](https://github.com/jwodder)) +- Satrajit Ghosh ([@satra](https://github.com/satra)) +- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic)) + +--- + # 0.7.2 (Thu Nov 19 2020) #### 🐛 Bug Fix diff --git a/dandi/models.py b/dandi/models.py index 56e3c4e31..bb640b039 100644 --- a/dandi/models.py +++ b/dandi/models.py @@ -178,7 +178,7 @@ class SpeciesType(TypeModel): """Identifier for species of the sample""" -class Disease(TypeModel): +class Disorder(TypeModel): """Biolink, SNOMED, or other identifier for disorder studied""" dxdate: Optional[List[date]] = Field( @@ -408,9 +408,9 @@ class BioSample(DandiBaseModel): description="An identifier indicating the taxonomic classification of the biosample", nskey="dandi", ) - disease: Optional[List[Disease]] = Field( + disorder: Optional[List[Disorder]] = Field( None, - description="Any current diagnosed disease associated with the sample", + description="Any current diagnosed disease or disorder associated with the sample", nskey="dandi", ) @@ -478,7 +478,7 @@ class CommonModel(DandiBaseModel): description="Contributors to this item.", nskey="schema", ) - about: Optional[List[Union[Disease, Anatomy, Identifier]]] = Field( + about: Optional[List[Union[Disorder, Anatomy, Identifier]]] = Field( None, title="Subject matter", description="The subject matter of the content, such as disorders, brain anatomy.", diff --git a/dandi/pynwb_utils.py b/dandi/pynwb_utils.py index f3132e382..a152a28e8 100644 --- a/dandi/pynwb_utils.py +++ b/dandi/pynwb_utils.py @@ -26,7 +26,7 @@ # strip away possible development version marker dandi_rel_version = __version__.split("+", 1)[0] -dandi_cache_tokens = [pynwb.__version__, dandi_rel_version] +dandi_cache_tokens = [pynwb.__version__, dandi_rel_version, h5py.__version__] metadata_cache = PersistentCache(name="metadata", tokens=dandi_cache_tokens) validate_cache = PersistentCache(name="validate", tokens=dandi_cache_tokens)