From 32caf8efea5b0b7f62b2e7d6b88e4f08f0b59cac Mon Sep 17 00:00:00 2001 From: Marc Chakiachvili Date: Fri, 10 Nov 2023 15:01:01 +0000 Subject: [PATCH 1/2] Update VERSION Target Release update to 1.3.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 589268e6..3a3cd8cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.0 \ No newline at end of file +1.3.1 From 64cafe3b1d0cde77d179ac3216204d63185d6d0f Mon Sep 17 00:00:00 2001 From: Marc Chakiachvili Date: Fri, 10 Nov 2023 15:05:24 +0000 Subject: [PATCH 2/2] Added Loadable to classes for debugging models values. --- src/ensembl/production/metadata/api/models/assembly.py | 6 +++--- src/ensembl/production/metadata/api/models/genome.py | 8 ++++---- src/ensembl/production/metadata/api/models/organism.py | 8 ++++---- src/ensembl/production/metadata/api/models/release.py | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ensembl/production/metadata/api/models/assembly.py b/src/ensembl/production/metadata/api/models/assembly.py index 5af959ff..724842f2 100644 --- a/src/ensembl/production/metadata/api/models/assembly.py +++ b/src/ensembl/production/metadata/api/models/assembly.py @@ -15,10 +15,10 @@ from sqlalchemy.dialects.mysql import TINYINT from sqlalchemy.orm import relationship -from ensembl.production.metadata.api.models.base import Base +from ensembl.production.metadata.api.models.base import Base, LoadAble -class Assembly(Base): +class Assembly(LoadAble, Base): __tablename__ = 'assembly' assembly_id = Column(Integer, primary_key=True) @@ -42,7 +42,7 @@ class Assembly(Base): genomes = relationship("Genome", back_populates="assembly", cascade="all, delete, delete-orphan") -class AssemblySequence(Base): +class AssemblySequence(LoadAble, Base): __tablename__ = 'assembly_sequence' __table_args__ = ( Index('assembly_sequence_assembly_id_accession_5f3e5119_uniq', 'assembly_id', 'accession', unique=True), diff --git a/src/ensembl/production/metadata/api/models/genome.py b/src/ensembl/production/metadata/api/models/genome.py index 1819b51f..de366221 100644 --- a/src/ensembl/production/metadata/api/models/genome.py +++ b/src/ensembl/production/metadata/api/models/genome.py @@ -15,10 +15,10 @@ from sqlalchemy.dialects.mysql import DATETIME, TINYINT from sqlalchemy.orm import relationship -from ensembl.production.metadata.api.models.base import Base +from ensembl.production.metadata.api.models.base import Base, LoadAble -class Genome(Base): +class Genome(LoadAble, Base): __tablename__ = "genome" genome_id = Column(Integer, primary_key=True) @@ -38,7 +38,7 @@ class Genome(Base): organism = relationship("Organism", back_populates="genomes") -class GenomeDataset(Base): +class GenomeDataset(LoadAble, Base): __tablename__ = "genome_dataset" genome_dataset_id = Column(Integer, primary_key=True) @@ -58,7 +58,7 @@ class GenomeDataset(Base): ensembl_release = relationship("EnsemblRelease", back_populates="genome_datasets") -class GenomeRelease(Base): +class GenomeRelease(LoadAble, Base): __tablename__ = "genome_release" genome_release_id = Column(Integer, primary_key=True) diff --git a/src/ensembl/production/metadata/api/models/organism.py b/src/ensembl/production/metadata/api/models/organism.py index 84bb3b1a..739baf42 100644 --- a/src/ensembl/production/metadata/api/models/organism.py +++ b/src/ensembl/production/metadata/api/models/organism.py @@ -15,10 +15,10 @@ from sqlalchemy.dialects.mysql import TINYINT from sqlalchemy.orm import relationship -from ensembl.production.metadata.api.models.base import Base +from ensembl.production.metadata.api.models.base import Base, LoadAble -class Organism(Base): +class Organism(LoadAble, Base): __tablename__ = "organism" organism_id = Column(Integer, primary_key=True) @@ -39,7 +39,7 @@ class Organism(Base): # organim_id and taxonomy_id to taxonomy_node #DIFFERENT DATABASE -class OrganismGroup(Base): +class OrganismGroup(LoadAble, Base): __tablename__ = "organism_group" __table_args__ = ( Index("group_type_name_63c2f6ac_uniq", "type", "name", unique=True), @@ -57,7 +57,7 @@ class OrganismGroup(Base): # none -class OrganismGroupMember(Base): +class OrganismGroupMember(LoadAble, Base): __tablename__ = "organism_group_member" __table_args__ = ( Index("organism_group_member_organism_id_organism_gro_fe8f49ac_uniq", "organism_id", "organism_group_id", diff --git a/src/ensembl/production/metadata/api/models/release.py b/src/ensembl/production/metadata/api/models/release.py index a964efc2..126b2fae 100644 --- a/src/ensembl/production/metadata/api/models/release.py +++ b/src/ensembl/production/metadata/api/models/release.py @@ -13,10 +13,10 @@ from sqlalchemy.dialects.mysql import TINYINT from sqlalchemy.orm import relationship -from ensembl.production.metadata.api.models.base import Base +from ensembl.production.metadata.api.models.base import Base, LoadAble -class EnsemblSite(Base): +class EnsemblSite(LoadAble, Base): __tablename__ = 'ensembl_site' site_id = Column(Integer, primary_key=True) @@ -30,7 +30,7 @@ class EnsemblSite(Base): # none -class EnsemblRelease(Base): +class EnsemblRelease(LoadAble, Base): __tablename__ = 'ensembl_release' __table_args__ = ( Index('ensembl_release_version_site_id_b743399a_uniq', 'version', 'site_id', unique=True),