libres 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

libres/__init__.py

@@ -5,7 +5,7 @@ from libres.db import new_scheduler
 
 registry = create_default_registry()
 
-__version__ = '0.9.0'
+__version__ = '0.9.1'
 __all__ = (
     'new_scheduler',
     'registry'

libres/context/registry.py

@@ -82,6 +82,8 @@ class Registry:
     """
 
     contexts: dict[str, Context]
+    # FIXME: Why do we allow this to be None? Do we make use
+    #        of this anywhere?
     master_context: Context | None = None
 
     def __init__(self) -> None:

libres/db/scheduler.py

@@ -269,7 +269,7 @@ class Scheduler(ContextServicesMixin):
         allocations = allocations.with_entities(Allocation.id)
         allocations = allocations.filter(Allocation.group.in_(groups))
 
-        query = self.managed_allocations()
+        query: Query[Allocation] = self.managed_allocations()
         query = query.join(ReservedSlot)
         query = query.filter(
             ReservedSlot.reservation_token == token
@@ -1629,8 +1629,6 @@ class Scheduler(ContextServicesMixin):
         assert start
         assert end
 
-        start, end = self._prepare_range(start, end)
-
         assert whole_day in ('yes', 'no', 'any')
         assert groups in ('yes', 'no', 'any')
 
@@ -1645,7 +1643,7 @@ class Scheduler(ContextServicesMixin):
         else:
             day_numbers = None
 
-        query = self.allocations_in_range(start, end)
+        query = self.allocations_in_range(*self._prepare_range(start, end))
         query = query.order_by(Allocation._start)
 
         allocations = []
@@ -1657,13 +1655,19 @@ class Scheduler(ContextServicesMixin):
 
             if not self.is_allocation_exposed(allocation):
                 continue
-
-            s = datetime.combine(allocation.start.date(), start.time())
-            e = datetime.combine(allocation.end.date(), end.time())
-
-            # the raw dates will be UTC
-            s = sedate.replace_timezone(s, 'UTC')
-            e = sedate.replace_timezone(e, 'UTC')
+            allocation_start = allocation.display_start()
+            # NOTE: We want the correct timezone, but we don't want the
+            #       date to be on the next day for a full-day reservation
+            #       so we skip the microsecond addition
+            allocation_end = sedate.to_timezone(allocation.end, self.timezone)
+            s = sedate.standardize_date(datetime.combine(
+                allocation_start.date(),
+                start.time()
+            ), self.timezone)
+            e = sedate.standardize_date(datetime.combine(
+                allocation_end.date(),
+                end.time()
+            ), self.timezone)
 
             if not allocation.overlaps(s, e):
                 continue

{libres-0.9.0.dist-info → libres-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libres
-Version: 0.9.0
+Version: 0.9.1
 Summary: A library to reserve things
 Home-page: http://github.com/seantis/libres/
 Author: Denis Krienbühl
@@ -142,6 +142,13 @@ After this, create a new release on Github.
 Changelog
 ---------
 
+0.9.1 (05.08.2025)
+~~~~~~~~~~~~~~~~~~~
+
+- Fixes bug in `Scheduler.search_allocations` when the searched
+  time range contains multiple DST <-> ST transitions.
+  [Daverball]
+
 0.9.0 (23.05.2025)
 ~~~~~~~~~~~~~~~~~~~
 

{libres-0.9.0.dist-info → libres-0.9.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 libres/.gitignore,sha256=tyWYoDW7-zMdsfiJIVONRWJ5JmqJCTHzBOsi_rkIYZg,49
-libres/__init__.py,sha256=PvqWkTPcr2krxpiiHWHCJEJ0-goR_I_aTo41XWRlQvQ,243
+libres/__init__.py,sha256=d2iNp33yOxIx7AAvW064M_9oiCtEl9Zxr1WVwK8Vl1U,243
 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=9UZcTQFZnTfHS1ERC8O8wXZqTwsxIz795q5Mi7UvnMg,4894
+libres/context/registry.py,sha256=JfV-QccpDbAEq154aHu7_-hznr5kXYY58czZ-0-m8vA,4986
 libres/context/session.py,sha256=bVvZ7cvSKffGrzxpDM7vKrGgwAPWRoS4No6HK1--xlg,2488
 libres/context/settings.py,sha256=IkdG67QUUuk_sQMXiwsJgelrsbx6M-7f72uJBA2JoJA,1374
 libres/db/__init__.py,sha256=Fks6T8aEacYVvXB9U1v182zKX7SuEUAkC5hTK50AuQk,145
 libres/db/queries.py,sha256=mVLMcFh7tbAOOp8fveB1T-ZBt0X3hQiaN5Krt5Mmhhs,10917
-libres/db/scheduler.py,sha256=L9I-vj3Y71h7rtPyaqfE4dD6QzZ79NiS48oXissY35w,64355
+libres/db/scheduler.py,sha256=Pg-bgyrMgCE54K7sXxChNw_NTIdviCZSO7_X0LG0o34,64711
 libres/db/models/__init__.py,sha256=IL52K-0tg_v6zuiiE2k4UQNqneeb8CLUUVo_t_OBU-g,325
 libres/db/models/allocation.py,sha256=Zi-H3HGz4Xt9VhwUZmoUMc8xGr8rPBNiHGumnYcjlwI,29005
 libres/db/models/base.py,sha256=Y2Lc60vJ1Du73D0sLozVNi1TfhtrQ3i_64NV7hsnc4g,117
@@ -26,8 +26,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.9.0.dist-info/licenses/LICENSE,sha256=w1rojULT3naueSnr4r62MSQipL4VPtsfEcTFmSKpVuI,1069
-libres-0.9.0.dist-info/METADATA,sha256=-nJfZgAP64skrmh5Xh3GwywW0Un7KznV_AbSq9CD6Xg,10048
-libres-0.9.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-libres-0.9.0.dist-info/top_level.txt,sha256=Exs6AnhZc0UTcsD5Ylyx1P89j19hJ4Dy13jxQyZwi3k,7
-libres-0.9.0.dist-info/RECORD,,
+libres-0.9.1.dist-info/licenses/LICENSE,sha256=w1rojULT3naueSnr4r62MSQipL4VPtsfEcTFmSKpVuI,1069
+libres-0.9.1.dist-info/METADATA,sha256=e-7a5dHP6OCJ5ob5wsH1-Wk4pr0qVMMZDU3wtzd4Y98,10222
+libres-0.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+libres-0.9.1.dist-info/top_level.txt,sha256=Exs6AnhZc0UTcsD5Ylyx1P89j19hJ4Dy13jxQyZwi3k,7
+libres-0.9.1.dist-info/RECORD,,

{libres-0.9.0.dist-info → libres-0.9.1.dist-info}/WHEEL

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