From caa03adbd3c9cf972c281114a56c9ab6d975a178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 18 Apr 2024 08:37:23 +0200
Subject: [PATCH] Remove zope.sqlalchemy and transactions as we don't use them
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 poetry.lock        | 23 +----------------------
 pyproject.toml     |  2 --
 tahrir/__init__.py |  2 --
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f019161..8b06b6c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2766,28 +2766,7 @@ docs = ["Sphinx", "repoze.sphinx.autointerface", "sphinx_rtd_theme"]
 test = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
 testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
 
-[[package]]
-name = "zope-sqlalchemy"
-version = "3.1"
-description = "Minimal Zope/SQLAlchemy transaction integration"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "zope.sqlalchemy-3.1-py3-none-any.whl", hash = "sha256:fdc7d65d8da335a34b90fb993e8217ef12808bad3025d2e3a6720db4138e4985"},
-    {file = "zope.sqlalchemy-3.1.tar.gz", hash = "sha256:d9c2c3be695c213c5e22b7f7c6a4a214fa8eb5940b033465ba1c10a9d8b346db"},
-]
-
-[package.dependencies]
-packaging = "*"
-setuptools = "*"
-SQLAlchemy = ">=1.1,<1.4.0 || >1.4.0,<1.4.1 || >1.4.1,<1.4.2 || >1.4.2,<1.4.3 || >1.4.3,<1.4.4 || >1.4.4,<1.4.5 || >1.4.5,<1.4.6 || >1.4.6"
-transaction = ">=1.6.0"
-"zope.interface" = ">=3.6.0"
-
-[package.extras]
-test = ["zope.testing"]
-
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.9.0"
-content-hash = "1b66b8cf70252010ce83d06ec32a66d07097b73de78db388bfdc95474842b11b"
+content-hash = "c9a9080e1796fbfe5c5dddcbd628452acc1e85df6b5320b445198b2dcdcbfd48"
diff --git a/pyproject.toml b/pyproject.toml
index b02a6a7..0b1b394 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,9 +38,7 @@ pyramid = "^2.0.2"
 pyramid-mako = "^1.1.0"
 tahrir-api = "^1.0.0"
 sqlalchemy = "^2.0.29"
-transaction = "^4.0"
 pyramid-tm = "^2.5"
-zope-sqlalchemy = "^3.1"
 qrcode = "^7.4.2"
 dogpile-cache = "^1.3.2"
 docutils = "^0.20.1 || ^0.21.0"
diff --git a/tahrir/__init__.py b/tahrir/__init__.py
index adeabd5..e500a8c 100644
--- a/tahrir/__init__.py
+++ b/tahrir/__init__.py
@@ -12,7 +12,6 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker
 from tahrir_api.dbapi import TahrirDatabase
-from zope.sqlalchemy import register
 
 from . import notifications
 from .app import get_root
@@ -35,7 +34,6 @@ def main(global_config, **settings):
             bind=create_engine(settings["sqlalchemy.url"]),
         )
     )
-    register(session_cls)
 
     def get_db(request):
         """Database retrieval function to be added to the request for