diff --git a/CHANGELOG.md b/CHANGELOG.md index 893dab6..fb505d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention. +## [0.2.0] - 2023-09-28 + ++ Add `Species` part table to `subject.py` + ## [0.1.8] - 2023-06-20 + Update - GitHub Actions workflows @@ -58,6 +62,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and + Add - `subject` schema + Add - `genotyping` schema +[0.2.0]: https://github.com/datajoint/element-animal/releases/tag/0.2.0 [0.1.8]: https://github.com/datajoint/element-animal/releases/tag/0.1.8 [0.1.7]: https://github.com/datajoint/element-animal/releases/tag/0.1.7 [0.1.6]: https://github.com/datajoint/element-animal/releases/tag/0.1.6 diff --git a/element_animal/subject.py b/element_animal/subject.py index f706105..b0b8888 100644 --- a/element_animal/subject.py +++ b/element_animal/subject.py @@ -162,6 +162,20 @@ class Subject(dj.Manual): subject_description='' : varchar(1024) """ + class Species(dj.Part): + """Subject species as Latin binomial or NCBI taxonomic identifier. + + Attributes: + Subject (foreign key): Primary key from Subject. + species (str): Subject species as Latin binomial or NCBI taxonomic identifier. + """ + + definition = """ + -> master + --- + species : varchar(32) + """ + class Protocol(dj.Part): """Protocol under which this subject animal is used. diff --git a/element_animal/version.py b/element_animal/version.py index 10bc5c5..8667345 100644 --- a/element_animal/version.py +++ b/element_animal/version.py @@ -1,2 +1,2 @@ """Package metadata.""" -__version__ = "0.1.8" +__version__ = "0.2.0" diff --git a/images/subject_diagram.svg b/images/subject_diagram.svg index a0588ed..b8aa399 100644 --- a/images/subject_diagram.svg +++ b/images/subject_diagram.svg @@ -1,215 +1,198 @@ - - - - - -subject.Line - - -subject.Line + + +%3 + + +subject.Subject.Source + + +subject.Subject.Source - - -subject.Line.Allele - - -subject.Line.Allele + +subject.Subject.User + + +subject.Subject.User - - -subject.Line->subject.Line.Allele - - - - -subject.Subject.Line - - -subject.Subject.Line + +subject.Line.Allele + + +subject.Line.Allele - - -subject.Line->subject.Subject.Line - - - - -subject.Allele.Source - - -subject.Allele.Source + +subject.Subject.Species + + +subject.Subject.Species - - -subject.Subject.Source - - -subject.Subject.Source + +subject.SubjectDeath + + +subject.SubjectDeath - - -subject.SubjectCullMethod - - -subject.SubjectCullMethod + +subject.SubjectCull + + +subject.SubjectCull - - -subject.Subject - - -subject.Subject - + +subject.SubjectDeath->subject.SubjectCull + + +subject.Strain + + +subject.Strain + - - -subject.Subject->subject.Subject.Source - - - - -subject.Subject->subject.SubjectCullMethod - - -subject.Subject.Strain - - -subject.Subject.Strain +subject.Subject.Strain + + +subject.Subject.Strain - - -subject.Subject->subject.Subject.Strain - + +subject.Strain->subject.Subject.Strain + - - -subject.SubjectDeath - - -subject.SubjectDeath + +subject.Line + + +subject.Line - - -subject.Subject->subject.SubjectDeath - - - - -subject.Subject->subject.Subject.Line - + +subject.Line->subject.Line.Allele + - - -subject.Subject.Protocol - - -subject.Subject.Protocol + +subject.Subject.Line + + +subject.Subject.Line - - -subject.Subject->subject.Subject.Protocol - + +subject.Line->subject.Subject.Line + - - -subject.Zygosity - - -subject.Zygosity + +subject.Subject.Lab + + +subject.Subject.Lab - - -subject.Subject->subject.Zygosity - - - - -subject.Subject.User - - -subject.Subject.User + +subject.Zygosity + + +subject.Zygosity - - -subject.Subject->subject.Subject.User - - - - -subject.Subject.Lab - - -subject.Subject.Lab + +subject.Allele.Source + + +subject.Allele.Source - - -subject.Subject->subject.Subject.Lab - + +subject.Subject.Protocol + + +subject.Subject.Protocol + + - -subject.Allele - - -subject.Allele +subject.Allele + + +subject.Allele - - -subject.Allele->subject.Allele.Source - - - -subject.Allele->subject.Line.Allele - +subject.Allele->subject.Line.Allele + - -subject.Allele->subject.Zygosity - +subject.Allele->subject.Zygosity + - - -subject.Strain - - -subject.Strain + +subject.Allele->subject.Allele.Source + + + +subject.Subject + + +subject.Subject - - -subject.Strain->subject.Subject.Strain - + +subject.Subject->subject.Subject.Source + + + +subject.Subject->subject.Subject.User + + + +subject.Subject->subject.Subject.Species + + + +subject.Subject->subject.SubjectDeath + + + +subject.Subject->subject.Subject.Lab + + + +subject.Subject->subject.Zygosity + + + +subject.Subject->subject.Subject.Strain + + + +subject.Subject->subject.Subject.Protocol + + + +subject.Subject->subject.Subject.Line + \ No newline at end of file