From 13e431751d8d823acfc8291b8c92fc917e815cc1 Mon Sep 17 00:00:00 2001 From: Guilherme de Freitas Date: Thu, 13 Mar 2025 10:23:35 +0000 Subject: [PATCH 1/3] Remove manual AutoProcScalingStatistics declaration --- src/ispyb/sqlalchemy/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ispyb/sqlalchemy/__init__.py b/src/ispyb/sqlalchemy/__init__.py index 31239d23..adfac0e5 100644 --- a/src/ispyb/sqlalchemy/__init__.py +++ b/src/ispyb/sqlalchemy/__init__.py @@ -23,11 +23,6 @@ back_populates="AutoProcProgram", overlaps="AutoProcProgramAttachment", ) -AutoProcScaling.AutoProcScalingStatistics = relationship( - "AutoProcScalingStatistics", - back_populates="AutoProcScaling", - overlaps="AutoProcScalingStatistics", -) ProcessingJob.ProcessingJobParameters = relationship( "ProcessingJobParameter", back_populates="ProcessingJob", From 892b49e45aa43088b821027d3294dd598b592354 Mon Sep 17 00:00:00 2001 From: Guilherme de Freitas Date: Thu, 13 Mar 2025 14:41:43 +0000 Subject: [PATCH 2/3] Replace manually declared accessors with synonyms --- HISTORY.rst | 6 ++++++ src/ispyb/sqlalchemy/__init__.py | 22 +++++----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index d93334d3..3df1ecc3 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,12 @@ History Unreleased / main ------------------- +11.0.2 (2025-03-13) +------------------- + +* Replace manually declared accessors in table models with SQLAlchemy 2 compatible synonyms (in ProcessingJob, AutoProcProgramAttachment) +* Remove manually declared accessors in AutoProcScaling + 11.0.1 (2025-03-11) ------------------- diff --git a/src/ispyb/sqlalchemy/__init__.py b/src/ispyb/sqlalchemy/__init__.py index adfac0e5..7addca8e 100644 --- a/src/ispyb/sqlalchemy/__init__.py +++ b/src/ispyb/sqlalchemy/__init__.py @@ -6,33 +6,21 @@ import sqlalchemy.engine import sqlalchemy.orm -from sqlalchemy.orm import relationship +from sqlalchemy.orm import relationship, synonym from ._auto_db_schema import * # noqa F403; lgtm from ._auto_db_schema import ( AutoProcProgram, - AutoProcScaling, ProcessingJob, __schema_version__, ) logger = logging.getLogger("ispyb.sqlalchemy") -AutoProcProgram.AutoProcProgramAttachments = relationship( - "AutoProcProgramAttachment", - back_populates="AutoProcProgram", - overlaps="AutoProcProgramAttachment", -) -ProcessingJob.ProcessingJobParameters = relationship( - "ProcessingJobParameter", - back_populates="ProcessingJob", - overlaps="ProcessingJobParameter", -) -ProcessingJob.ProcessingJobImageSweeps = relationship( - "ProcessingJobImageSweep", - back_populates="ProcessingJob", - overlaps="ProcessingJobImageSweep", -) +AutoProcProgram.AutoProcProgramAttachments = synonym("AutoProcProgramAttachment") +ProcessingJob.ProcessingJobParameters = synonym("ProcessingJobParameter") +ProcessingJob.ProcessingJobImageSweeps = synonym("ProcessingJobImageSweep") + assert __schema_version__ From 1d53513d00b6ac55fe4b09df90dd57fea2e8a832 Mon Sep 17 00:00:00 2001 From: Guilherme de Freitas Date: Thu, 13 Mar 2025 14:41:48 +0000 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=2011.0.1=20=E2=86=92=2011.0?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 4 ++-- src/ispyb/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 51833a9d..46d8b871 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "ispyb" -version = "11.0.1" +version = "11.0.2" description = "Python package to access ISPyB database" authors = [ { name = "Diamond Light Source", email = "scientificsoftware@diamond.ac.uk" }, @@ -59,7 +59,7 @@ unfixable = ["F841"] ignore = ["E501"] [tool.bumpversion] -current_version = "11.0.1" +current_version = "11.0.2" commit = true tag = true diff --git a/src/ispyb/__init__.py b/src/ispyb/__init__.py index 55eac3a1..430f6038 100644 --- a/src/ispyb/__init__.py +++ b/src/ispyb/__init__.py @@ -3,7 +3,7 @@ import os import warnings -__version__ = "11.0.1" +__version__ = "11.0.2" _log = logging.getLogger("ispyb")