Merge pull request #1406 from procrastinate-org/upgrade

Author: ewjoachim

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
       - id: mixed-line-ending
 
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.400
+    rev: v1.1.401
     hooks:
       - id: pyright
         additional_dependencies:
@@ -66,7 +66,7 @@ repos:
           - jinja2==3.1.6
           - markupsafe==3.0.2
           - packaging==25.0
-          - psycopg==3.2.8
+          - psycopg==3.2.9
           - psycopg-pool==3.2.6
           - psycopg2-binary==2.9.10
           - pygments==2.19.1
@@ -85,16 +85,16 @@ repos:
           - sphinxcontrib-jsmath==1.0.1
           - sphinxcontrib-qthelp==2.0.0
           - sphinxcontrib-serializinghtml==2.0.0
-          - sqlalchemy==2.0.40
+          - sqlalchemy==2.0.41
           - sqlparse==0.5.3
           - tomli==2.2.1 ; python_full_version < '3.11'
-          - types-pyyaml==6.0.12.20250402
+          - types-pyyaml==6.0.12.20250516
           - typing-extensions==4.13.2
           - tzdata==2025.2 ; sys_platform == 'win32'
           - urllib3==2.4.0
-          - zipp==3.21.0 ; python_full_version < '3.10'
+          - zipp==3.22.0 ; python_full_version < '3.10'
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.9
+    rev: v0.11.12
     hooks:
       - id: ruff
         args: [--fix, --unsafe-fixes, --show-fixes]

procrastinate/contrib/sqlalchemy/psycopg2_connector.py

@@ -8,6 +8,7 @@
 
 import psycopg2.errors
 import sqlalchemy
+import sqlalchemy.exc
 from psycopg2.extras import Json
 
 from procrastinate import connector, exceptions, manager
@@ -20,7 +21,7 @@ def wrap_exceptions() -> Generator[None, None, None]:
     """
     try:
         yield
-    except sqlalchemy.exc.SQLAlchemyError as exc:
+    except sqlalchemy.exc.StatementError as exc:
         if isinstance(exc.orig, psycopg2.errors.UniqueViolation):
             exc = exc.orig
             constraint_name = exc.diag.constraint_name
@@ -36,6 +37,8 @@ def wrap_exceptions() -> Generator[None, None, None]:
                 constraint_name=constraint_name, queueing_lock=queueing_lock
             )
         raise exceptions.ConnectorException from exc
+    except sqlalchemy.exc.SQLAlchemyError as exc:
+        raise exceptions.ConnectorException from exc
 
 
 def wrap_query_exceptions(func: Callable) -> Callable:

pyproject.toml

@@ -115,6 +115,7 @@ filterwarnings = """
     error
     ignore:.+django.core.management.base.OutputWrapper:pytest.PytestUnraisableExceptionWarning
     ignore:unclosed.+:ResourceWarning
+    ignore:pkg_resources is deprecated as an API:UserWarning
 """
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "function"