Skip to content

Remove manual AutoProcScalingStatistics declaration #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gfrn merged 3 commits into from
Mar 14, 2025
Merged

Remove manual AutoProcScalingStatistics declaration #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13e4317
Remove manual AutoProcScalingStatistics declaration
gfrn Mar 13, 2025
892b49e
Replace manually declared accessors with synonyms
gfrn Mar 13, 2025
1d53513
Bump version: 11.0.1 → 11.0.2
gfrn Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-------------------

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down Expand Up @@ -59,7 +59,7 @@ unfixable = ["F841"]
ignore = ["E501"]

[tool.bumpversion]
current_version = "11.0.1"
current_version = "11.0.2"
commit = true
tag = true

Expand Down
2 changes: 1 addition & 1 deletion src/ispyb/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import warnings

__version__ = "11.0.1"
__version__ = "11.0.2"

_log = logging.getLogger("ispyb")

Expand Down
27 changes: 5 additions & 22 deletions src/ispyb/sqlalchemy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +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",
)
AutoProcScaling.AutoProcScalingStatistics = relationship(
"AutoProcScalingStatistics",
back_populates="AutoProcScaling",
overlaps="AutoProcScalingStatistics",
)
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__


Expand Down
Loading