libres 0.10.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

libres/__init__.py

@@ -5,7 +5,7 @@ from libres.db import new_scheduler
 
 registry = create_default_registry()  # noqa: RUF067
 
-__version__ = '0.10.0'
+__version__ = '0.10.2'
 __all__ = (
     'new_scheduler',
     'registry'

libres/context/session.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, text
 from sqlalchemy.pool import QueuePool
 from sqlalchemy.orm import scoped_session, sessionmaker
 
@@ -34,12 +34,12 @@ class SessionProvider(StoppableService):
 
         self.engine = create_engine(
             dsn, poolclass=QueuePool, pool_size=5, max_overflow=5,
-            isolation_level=SERIALIZABLE,
+            isolation_level=SERIALIZABLE, future=True,
             **(engine_config or {})
         )
 
         self.session = scoped_session(sessionmaker(
-            bind=self.engine, **(session_config or {})
+            bind=self.engine, future=True, **(session_config or {}),
         ))
 
     def stop_service(self) -> None:
@@ -58,20 +58,21 @@ class SessionProvider(StoppableService):
     def get_postgres_version(self, dsn: str) -> tuple[str, int]:
         """ Returns the postgres version as a tuple (string, integer).
 
-        Uses it's own connection to be independent from any session.
+        Uses its own connection to be independent from any session.
 
         """
         assert 'postgres' in dsn, 'Not a postgres database'
 
-        query = """
+        query = text("""
             SELECT current_setting('server_version'),
                    current_setting('server_version_num')
-        """
+        """)
 
-        engine = create_engine(dsn)
+        engine = create_engine(dsn, future=True)
 
         try:
-            result = engine.execute(query).first()
+            with engine.connect() as conn:
+                result = conn.execute(query).first()
             assert result is not None
             version, number = result
             return version, int(number)

libres/db/models/allocation.py

@@ -84,7 +84,7 @@ class Allocation(TimestampMixin, ORMBase, OtherModels):
     resource: Column[uuid.UUID] = Column(UUID(), nullable=False)
 
     #: the polymorphic type of the allocation
-    type: Column[str | None] = Column(types.Text(), nullable=True)
+    type: Column[str] = Column(types.Text(), nullable=False, default='generic')
 
     #: resource of which this allocation is a mirror. If the mirror_of
     #: attribute equals the resource, this is a real resource
@@ -153,7 +153,7 @@ class Allocation(TimestampMixin, ORMBase, OtherModels):
     )
 
     __mapper_args__ = {
-        'polymorphic_identity': None,
+        'polymorphic_identity': 'generic',
         'polymorphic_on': type
     }
 

libres/db/models/base.py

@@ -1,5 +1,11 @@
 from __future__ import annotations
 
-from sqlalchemy.ext import declarative
 
-ORMBase = declarative.declarative_base()
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from sqlalchemy.ext.declarative import declarative_base
+else:
+    # FIXME: Move this import out when dropping 1.4 support
+    from sqlalchemy.orm import declarative_base
+
+ORMBase = declarative_base()

libres/db/models/reservation.py

@@ -60,7 +60,8 @@ class Reservation(TimestampMixin, ORMBase, OtherModels):
 
     type: Column[str | None] = Column(
         types.Text(),
-        nullable=True
+        nullable=False,
+        default='generic'
     )
 
     resource: Column[uuid.UUID] = Column(
@@ -117,7 +118,7 @@ class Reservation(TimestampMixin, ORMBase, OtherModels):
     )
 
     __mapper_args__ = {
-        'polymorphic_identity': None,
+        'polymorphic_identity': 'generic',
         'polymorphic_on': type
     }
 

libres/db/models/types/json_type.py

@@ -25,6 +25,7 @@ class JSON(_Base):
     """
 
     impl = JSONB
+    cache_ok = True
 
     def process_bind_param(  # type:ignore[override]
         self,

{libres-0.10.0.dist-info → libres-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libres
-Version: 0.10.0
+Version: 0.10.2
 Summary: A library to reserve things
 Home-page: http://github.com/seantis/libres/
 Author: Denis Krienbühl
@@ -142,6 +142,34 @@ After this, create a new release on Github.
 Changelog
 ---------
 
+0.10.2 (05.02.2026)
+~~~~~~~~~~~~~~~~~~~
+
+- Prepares for SQLAlchemy 2.0 support
+  [Daverball]
+
+0.10.1 (21.01.2026)
+~~~~~~~~~~~~~~~~~~~
+
+- Adds proper support for SQLAlchemy 1.4. As a result of this
+  `Allocation.type` and `Reservation.type` are no longer nullable
+  and have a default value of 'generic', you may use the following
+  recipe using an alembic `Operations` object to migrate existing
+  databases::
+
+    context.operations.execute("""
+      UPDATE allocations
+         SET type = 'generic'
+       WHERE type IS NULL;
+    """)
+    context.operations.alter_column('allocations', 'type', nullable=False)
+    context.operations.execute("""
+      UPDATE reservations
+         SET type = 'generic'
+       WHERE type IS NULL;
+    """)
+    context.operations.alter_column('reservations', 'type', nullable=False)
+
 0.10.0 (15.01.2026)
 ~~~~~~~~~~~~~~~~~~~
 

{libres-0.10.0.dist-info → libres-0.10.2.dist-info}/RECORD

@@ -1,26 +1,26 @@
 libres/.gitignore,sha256=tyWYoDW7-zMdsfiJIVONRWJ5JmqJCTHzBOsi_rkIYZg,49
-libres/__init__.py,sha256=9v-iLfER2w_g4fiTMUPafUATTCY4gPd72_57PqtTeog,260
+libres/__init__.py,sha256=owV-Xu87GRHQXxvYXPK2BO6MeN4ZtDx0BciN5RMn5-o,260
 libres/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 libres/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 libres/context/core.py,sha256=AZMmFVqTVSkK3pomhoamLWOeqynY23g_uf32yjhgrRQ,7353
 libres/context/exposure.py,sha256=0krsky3XYplG7Uf5oLlQgdXp6XuEDjN2JGe3ljgLM14,287
 libres/context/registry.py,sha256=JfV-QccpDbAEq154aHu7_-hznr5kXYY58czZ-0-m8vA,4986
-libres/context/session.py,sha256=bVvZ7cvSKffGrzxpDM7vKrGgwAPWRoS4No6HK1--xlg,2488
+libres/context/session.py,sha256=1iFsnXidRzUUPI6sHgKEOfw59oET2nddP9x03AxFpSY,2584
 libres/context/settings.py,sha256=IkdG67QUUuk_sQMXiwsJgelrsbx6M-7f72uJBA2JoJA,1374
 libres/db/__init__.py,sha256=Fks6T8aEacYVvXB9U1v182zKX7SuEUAkC5hTK50AuQk,145
 libres/db/queries.py,sha256=EqsrKL5x5OlTWefvcESs5zg7ZyneXavTC-sGARX4OxM,11043
 libres/db/scheduler.py,sha256=mPuA-48VWQvzHQVy0VsXz4Be_f1YDVlElXWjwGaI6hA,77373
 libres/db/models/__init__.py,sha256=ESy82b2y6YX_D143QP2cns1MRsXxO32fQUvrc7DE6VY,408
-libres/db/models/allocation.py,sha256=4n6zjHWUSzxICjkap1s0pQgDOMki1vkO4l1MI65Ynk8,30699
-libres/db/models/base.py,sha256=Y2Lc60vJ1Du73D0sLozVNi1TfhtrQ3i_64NV7hsnc4g,117
+libres/db/models/allocation.py,sha256=BzDE7SDvcP1AH_T_P2g5JmcWop06b2rYIUbno8OtXPY,30717
+libres/db/models/base.py,sha256=Lr1INBdHl_e32EvXbTWBH_3FAKbRVZmWXWfghl7E-8k,292
 libres/db/models/blocker.py,sha256=P30FLf-ILqT03ZHnbFBVykY37xFAuCeOglhIH6B_1-c,4488
 libres/db/models/other.py,sha256=XRdyLo1gFY-Sg4iBSPBwOxeqZSpL5PerZISexcAQyDg,853
-libres/db/models/reservation.py,sha256=NnsH1PL_Tu2zt-fHMl_KURfj0RsvJzCPj-SmE-GR86Q,5819
+libres/db/models/reservation.py,sha256=3hLIgyIAAi1f5HuQekLx1FVyZeVn0jMc6tKm4p8cGKM,5852
 libres/db/models/reserved_slot.py,sha256=nVggmkPBB4oR1f5dEH-bsLggX5hAUNqfH7CApcRoApw,3263
 libres/db/models/timespan.py,sha256=uo6Xjie5rzm8JklsdCp0CyjeUPYOSHO9tOZI3b1oShs,220
 libres/db/models/timestamp.py,sha256=EsuxdQSUsPCkHb1F7HdrDevWZ5wDWerDFRIhqfhefNw,1301
 libres/db/models/types/__init__.py,sha256=8fx7ecDasCKsCJxGjt4qP5BbDJCG88dJRa0nzD6IetY,186
-libres/db/models/types/json_type.py,sha256=ko6K4YRWERWCpg0wYzuwJ_u-VLJ4K3j3ksJ7cGyiMzw,1137
+libres/db/models/types/json_type.py,sha256=yDRc0RQfVRLGfXH_hKDqPaVUkdy8m9XYrr5PU8GPdeU,1157
 libres/db/models/types/utcdatetime.py,sha256=4Wlk0Yc6e3PljOjngUGuYvo8jps76RYVkCEwmPygzsY,1285
 libres/db/models/types/uuid_type.py,sha256=sesgyF65JV0Zh2ty7rSeALpZxKjVg1Y68_Pv7gJAuAo,1675
 libres/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,8 +28,8 @@ libres/modules/errors.py,sha256=afcvKDfu7XYnGt6CfTG1gpmCaoMTPgtxwmTe2Cyz9qc,2146
 libres/modules/events.py,sha256=-YHwFJKory8RSIRTths5LBn92sodEPkhARH_a1Xml3c,5299
 libres/modules/rasterizer.py,sha256=-KYG03YkaPNnyohl_HrEJZqdHrhmGesbLgxxPahNTCc,3155
 libres/modules/utils.py,sha256=W5Kuu9LhhUWZMKLAhw7DmQEuNYb9aXWpW_HXCn62lhU,1871
-libres-0.10.0.dist-info/licenses/LICENSE,sha256=w1rojULT3naueSnr4r62MSQipL4VPtsfEcTFmSKpVuI,1069
-libres-0.10.0.dist-info/METADATA,sha256=f3P6JcW2iBhZb666Qj1BDmttM6Z1YQiILrOGTsabres,10924
-libres-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-libres-0.10.0.dist-info/top_level.txt,sha256=Exs6AnhZc0UTcsD5Ylyx1P89j19hJ4Dy13jxQyZwi3k,7
-libres-0.10.0.dist-info/RECORD,,
+libres-0.10.2.dist-info/licenses/LICENSE,sha256=w1rojULT3naueSnr4r62MSQipL4VPtsfEcTFmSKpVuI,1069
+libres-0.10.2.dist-info/METADATA,sha256=EaqYg7H2bzc_gQ0Zy5ECWdSyybZ7ynB_mE3NJlYMtBo,11740
+libres-0.10.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+libres-0.10.2.dist-info/top_level.txt,sha256=Exs6AnhZc0UTcsD5Ylyx1P89j19hJ4Dy13jxQyZwi3k,7
+libres-0.10.2.dist-info/RECORD,,

{libres-0.10.0.dist-info → libres-0.10.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any