c2cwsgiutils 7.0.0.dev14__tar.gz → 7.0.0.dev19__tar.gz

{c2cwsgiutils-7.0.0.dev14 → c2cwsgiutils-7.0.0.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 7.0.0.dev14
+Version: 7.0.0.dev19
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause
@@ -33,22 +33,21 @@ Provides-Extra: standard
 Provides-Extra: test-images
 Provides-Extra: tests
 Provides-Extra: webserver
-Requires-Dist: SQLAlchemy
-Requires-Dist: SQLAlchemy-Utils
+Requires-Dist: SQLAlchemy ; extra == "standard" or extra == "webserver" or extra == "all"
+Requires-Dist: SQLAlchemy-Utils ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: alembic ; extra == "standard" or extra == "alembic" or extra == "all"
 Requires-Dist: boltons ; extra == "tests" or extra == "all"
 Requires-Dist: cee_syslog_handler
-Requires-Dist: certifi
-Requires-Dist: cornice
+Requires-Dist: cornice ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: gunicorn ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: lxml ; extra == "tests" or extra == "all"
 Requires-Dist: objgraph ; extra == "debug" or extra == "all"
-Requires-Dist: prometheus-client
-Requires-Dist: psycopg2
+Requires-Dist: prometheus-client ; extra == "standard" or extra == "webserver" or extra == "all"
+Requires-Dist: psycopg2 ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: pyjwt ; extra == "standard" or extra == "oauth2" or extra == "all"
-Requires-Dist: pyramid
-Requires-Dist: pyramid-tm
-Requires-Dist: pyramid_mako
+Requires-Dist: pyramid ; extra == "standard" or extra == "webserver" or extra == "all"
+Requires-Dist: pyramid-tm ; extra == "standard" or extra == "webserver" or extra == "all"
+Requires-Dist: pyramid_mako ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: pyyaml
 Requires-Dist: redis ; extra == "standard" or extra == "broadcast" or extra == "all"
 Requires-Dist: requests
@@ -57,8 +56,8 @@ Requires-Dist: scikit-image ; extra == "test-images"
 Requires-Dist: sentry-sdk ; extra == "standard" or extra == "sentry" or extra == "all"
 Requires-Dist: ujson
 Requires-Dist: waitress ; extra == "dev" or extra == "all"
-Requires-Dist: zope.interface
-Requires-Dist: zope.sqlalchemy
+Requires-Dist: zope.interface ; extra == "standard" or extra == "webserver" or extra == "all"
+Requires-Dist: zope.sqlalchemy ; extra == "standard" or extra == "webserver" or extra == "all"
 Project-URL: Repository, https://github.com/camptocamp/c2cwsgiutils
 Description-Content-Type: text/markdown
 

{c2cwsgiutils-7.0.0.dev14 → c2cwsgiutils-7.0.0.dev19}/c2cwsgiutils/request_tracking/_sql.py

@@ -5,7 +5,7 @@ from pyramid.threadlocal import get_current_request
 from sqlalchemy.orm import Session
 
 
-def _add_session_id(session: Session, _transaction: Any, _connection: Any) -> None:
+def _add_session_id(session: Session, _transaction: Any) -> None:
     request = get_current_request()
     if request is not None:
         session.execute(
@@ -15,4 +15,5 @@ def _add_session_id(session: Session, _transaction: Any, _connection: Any) -> No
 
 def init() -> None:
     """Initialize the SQL alchemy session selector."""
-    sqlalchemy.event.listen(Session, "after_begin", _add_session_id)
+
+    sqlalchemy.event.listen(Session, "after_transaction_create", _add_session_id)

{c2cwsgiutils-7.0.0.dev14 → c2cwsgiutils-7.0.0.dev19}/pyproject.toml

@@ -16,7 +16,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "7.0.0.dev14"
+version = "7.0.0.dev19"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -71,28 +71,27 @@ requests = { version = "2.31.0" }
 pyyaml = { version = "6.0.1" }
 alembic = { version = "1.12.0", optional = true }
 boltons = { version = "23.0.0", optional = true }
-cornice = { version = "6.0.1" }
+cornice = { version = "6.0.1", optional = true }
 redis = { version = "5.0.1", optional = true }
 gunicorn = { version = "21.2.0", optional = true }
 lxml = { version = "4.9.3", optional = true }
 objgraph = { version = "3.6.0", optional = true }
-psycopg2 = { version = "2.9.8" }
-pyramid = { version = "2.0.2" }
-pyramid-tm = { version = "2.5" }
+psycopg2 = { version = "2.9.8", optional = true }
+pyramid = { version = "2.0.2", optional = true }
+pyramid-tm = { version = "2.5", optional = true }
 sentry-sdk = { version = "1.31.0", optional = true }
 ujson = { version = "5.8.0" }
 cee_syslog_handler = { version = "0.6.0" }
-SQLAlchemy = { version = "2.0.16" }
-SQLAlchemy-Utils = { version = "0.41.1" }
-"zope.interface" = { version = "6.0" }
-"zope.sqlalchemy" = { version = "3.1" }
+SQLAlchemy = { version = "2.0.16", optional = true }
+SQLAlchemy-Utils = { version = "0.41.1", optional = true }
+"zope.interface" = { version = "6.0", optional = true }
+"zope.sqlalchemy" = { version = "3.1", optional = true }
 pyjwt = { version = "2.8.0", optional = true }
 requests-oauthlib = { version = "1.3.1", optional = true }
 waitress = { version = "2.1.2", optional = true }
 scikit-image = { version = "0.21.0", optional = true }
-certifi = "2023.7.22"
-prometheus-client = "0.17.1"
-pyramid_mako = "1.1.0"
+prometheus-client = { version = "0.17.1", optional = true}
+pyramid_mako = { version = "1.1.0", optional = true}
 
 [tool.poetry.extras]
 standard = [
@@ -106,7 +105,17 @@ standard = [
   # broadcast
   "redis",
   # webserver
+  "cornice",
   "gunicorn",
+  "psycopg2",
+  "pyramid",
+  "pyramid-tm",
+  "SQLAlchemy",
+  "SQLAlchemy-Utils",
+  "zope.interface",
+  "zope.sqlalchemy",
+  "prometheus_client",
+  "pyramid_mako",
 ]
 alembic = ["alembic"]
 debug = ["objgraph"]
@@ -114,7 +123,18 @@ oauth2 = ["pyjwt", "requests-oauthlib"]
 sentry = ["sentry-sdk"]
 dev = ["waitress"]
 broadcast = ["redis"]
-webserver = ["gunicorn"]
+webserver = [
+  "cornice",
+  "gunicorn",
+  "psycopg2",
+  "pyramid",
+  "pyramid-tm",
+  "SQLAlchemy",
+  "SQLAlchemy-Utils",
+  "zope.interface",
+  "zope.sqlalchemy",
+  "prometheus_client",
+  "pyramid_mako"]
 tests = ["lxml", "boltons"]
 all = [
   # alembic
@@ -131,7 +151,17 @@ all = [
   # broadcast
   "redis",
   # webserver
+  "cornice",
   "gunicorn",
+  "psycopg2",
+  "pyramid",
+  "pyramid-tm",
+  "SQLAlchemy",
+  "SQLAlchemy-Utils",
+  "zope.interface",
+  "zope.sqlalchemy",
+  "prometheus_client",
+  "pyramid_mako",
   # tests
   "lxml",
   "boltons",