libres 0.9.0__tar.gz → 0.9.1__tar.gz

{libres-0.9.0 → libres-0.9.1}/HISTORY.rst

@@ -1,6 +1,13 @@
 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/src/libres.egg-info → libres-0.9.1}/PKG-INFO

@@ -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 → libres-0.9.1}/pyproject.toml

@@ -11,7 +11,7 @@ branch = true
 source = ["src"]
 
 [tool.bumpversion]
-current_version = "0.9.0"
+current_version = "0.9.1"
 commit = true
 message = "Release {new_version}"
 tag = true
@@ -108,6 +108,7 @@ select = [
     "PERF",
     "PGH004",
     "PIE",
+    "PT",
     "PYI",
     "Q",
     "RUF",
@@ -164,11 +165,11 @@ allowed-confusables = ["×"]
 preview = true
 
 [tool.ruff.lint.extend-per-file-ignores]
+"src/**/*.py" = ["PT"]
 "tests/**/*.py" = [
     "C4",
     "D",
     "FLY002",
-    "I002",
     "ISC",
     "N",
     "Q",
@@ -219,65 +220,80 @@ docstring-code-format = true
 docstring-code-line-length = "dynamic"
 
 [tool.tox]
-legacy_tox_ini = """
-[tox]
-envlist = py39,py310,py311,flake8,bandit,mypy,report
-
-[gh-actions]
-python =
-    3.9: py39
-    3.10: py310
-    3.11: py311,flake8,bandit,mypy
-    3.12: py312
-    3.13: py313
+requires = ["tox>=4.21"]
+envlist = [
+    "3.9",
+    "3.10",
+    "3.11",
+    "3.12",
+    "3.13",
+    "flake8",
+    "ruff",
+    "bandit",
+    "mypy",
+    "report"
+]
 
-[testenv]
-usedevelop = true
-setenv =
-    py{39,310,311,312,313}: COVERAGE_FILE = .coverage.{envname}
-deps =
-    -e{toxinidir}[test]
-commands = pytest --cov --cov-report= {posargs}
+[tool.tox.gh.python]
+"3.9" = ["3.9"]
+"3.10" = ["3.10"]
+"3.11" = ["3.11", "flake8", "bandit", "ruff", "mypy"]
+"3.12" = ["3.12"]
+"3.13" = ["3.13"]
 
-[testenv:ruff]
-basepython = python3.11
+[tool.tox.env_run_base]
+use_develop = true
+set_env = { COVERAGE_FILE = ".coverage.{envname}" }
+deps = ["-e{toxinidir}[test]"]
+commands = [
+    [
+        "pytest",
+        "--cov",
+        "--cov-report=",
+        { replace = "posargs", default = [], extend = true }
+    ],
+]
+[tool.tox.env.ruff]
+base_python = ["python3.11"]
 skip_install = true
-deps =
-    ruff
-commands = ruff check
+deps = ["ruff"]
+commands = [["ruff", "check"]]
 
-[testenv:flake8]
-basepython = python3.11
+[tool.tox.env.flake8]
+base_python = ["python3.11"]
 skip_install = true
-deps =
-    flake8
-    flake8-type-checking
-commands = flake8 src/ tests/
+deps = [
+    "flake8",
+    "flake8-type-checking",
+]
+commands = [["flake8", "src{/}", "tests{/}"]]
 
-[testenv:bandit]
-basepython = python3.11
+[tool.tox.env.bandit]
+base_python = ["python3.11"]
 skip_install = true
-deps =
-    bandit[toml]
-commands = bandit -q -c pyproject.toml -r src
+deps = ["bandit[toml]"]
+commands = [["bandit", "-q", "-c", "pyproject.toml", "-r", "src"]]
 
-[testenv:mypy]
-basepython = python3.11
-deps =
-    -e{toxinidir}[mypy]
-commands =
-    mypy -p libres --python-version 3.9
-    mypy -p libres --python-version 3.10
-    mypy -p libres --python-version 3.11
-    mypy -p libres --python-version 3.12
-    mypy -p libres --python-version 3.13
-
-[testenv:report]
-deps =
-    coverage
+[tool.tox.env.mypy]
+base_python = ["python3.11"]
 skip_install = true
-commands =
-    coverage combine
-    coverage report -m
+deps = ["-e{toxinidir}[mypy]"]
+commands = [
+    ["mypy", "-p", "libres", "--python-version", "3.9"],
+    ["mypy", "-p", "libres", "--python-version", "3.10"],
+    ["mypy", "-p", "libres", "--python-version", "3.11"],
+    ["mypy", "-p", "libres", "--python-version", "3.12"],
+    ["mypy", "-p", "libres", "--python-version", "3.13"],
+]
 
-"""
+[tool.tox.env.report]
+base_python = ["python3.11"]
+skip_install = true
+ignore_errors = true
+ignore_outcome = true
+set_env = { COVERAGE_FILE = ".coverage" }
+deps = ["coverage"]
+commands = [
+    ["coverage", "combine", "{toxinidir}"],
+    ["coverage", "report", "-m"],
+]

{libres-0.9.0 → libres-0.9.1}/src/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-0.9.0 → libres-0.9.1}/src/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-0.9.0 → libres-0.9.1}/src/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 → libres-0.9.1/src/libres.egg-info}/PKG-INFO

@@ -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 → libres-0.9.1}/tests/test_allocation.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from datetime import datetime, time
@@ -8,12 +10,17 @@ from sqlalchemy.exc import IntegrityError
 from uuid import uuid4 as new_uuid
 
 
-def test_add_allocation(scheduler):
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from libres.db.scheduler import Scheduler
+
 
-    allocation = Allocation(raster=15, resource=scheduler.resource)
+def test_add_allocation(scheduler: Scheduler) -> None:
+
+    allocation = Allocation(raster=15, resource=scheduler.resource)  # type: ignore[misc]
     allocation.start = datetime(2011, 1, 1, 15, tzinfo=utc)
     allocation.end = datetime(2011, 1, 1, 15, 59, tzinfo=utc)
-    allocation.group = new_uuid().hex
+    allocation.group = new_uuid()
     allocation.mirror_of = scheduler.resource
 
     scheduler.session.add(allocation)
@@ -22,14 +29,14 @@ def test_add_allocation(scheduler):
     assert scheduler.session.query(Allocation).count() == 1
 
 
-def test_add_invalid_allocation(scheduler):
-    scheduler.session.add(Allocation(raster=15))
+def test_add_invalid_allocation(scheduler: Scheduler) -> None:
+    scheduler.session.add(Allocation(raster=15))  # type: ignore[misc]
 
     with pytest.raises(IntegrityError):
         scheduler.commit()
 
 
-def test_get_master(scheduler):
+def test_get_master(scheduler: Scheduler) -> None:
     dates = [
         (datetime(2015, 2, 6, 12), datetime(2015, 2, 6, 13)),
         (datetime(2015, 2, 7, 12), datetime(2015, 2, 7, 13))
@@ -50,7 +57,7 @@ def test_get_master(scheduler):
     assert siblings[1].get_master().id == allocations[0].id
 
 
-def test_imaginary_siblings(scheduler):
+def test_imaginary_siblings(scheduler: Scheduler) -> None:
     dates = [(datetime(2015, 2, 6, 12), datetime(2015, 2, 6, 13))]
     allocations = scheduler.allocate(dates=dates, quota=2)
 
@@ -65,8 +72,8 @@ def test_imaginary_siblings(scheduler):
         imaginary_allocation.siblings(imaginary=False)
 
 
-def test_date_functions(scheduler):
-    allocation = Allocation(raster=60, resource=scheduler.resource)
+def test_date_functions(scheduler: Scheduler) -> None:
+    allocation = Allocation(raster=60, resource=scheduler.resource)  # type: ignore[misc]
     allocation.timezone = 'UTC'
     allocation.start = datetime(2011, 1, 1, 12, 30, tzinfo=utc)
     allocation.end = datetime(2011, 1, 1, 14, 00, tzinfo=utc)
@@ -89,8 +96,8 @@ def test_date_functions(scheduler):
     assert not allocation.contains(start, end)
 
 
-def test_whole_day():
-    allocation = Allocation(
+def test_whole_day() -> None:
+    allocation = Allocation(  # type: ignore[misc]
         raster=15, resource=new_uuid(), timezone='Europe/Zurich'
     )
 
@@ -113,11 +120,11 @@ def test_whole_day():
     allocation.start = datetime(2013, 1, 1, 15, 0, tzinfo=utc)
     allocation.end = datetime(2013, 1, 1, 0, 0, tzinfo=utc)
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match=r'equal or greater than the start'):
         _ = allocation.whole_day
 
 
-def test_separate_allocation(scheduler):
+def test_separate_allocation(scheduler: Scheduler) -> None:
 
     # allocations which are partly available are never in a group
     # (some code, for example allocation.is_separarate, depends on that)
@@ -147,10 +154,10 @@ def test_separate_allocation(scheduler):
     assert allocations[0].is_separate
 
 
-def test_limit_timespan():
+def test_limit_timespan() -> None:
 
     # if not partly availabe the limit is always the same
-    allocation = Allocation(
+    allocation = Allocation(  # type: ignore[misc]
         raster=15, resource=new_uuid(), partly_available=False, timezone='UTC'
     )
 
@@ -166,7 +173,7 @@ def test_limit_timespan():
     )
 
     # if partly available, more complex things happen
-    allocation = Allocation(
+    allocation = Allocation(  # type: ignore[misc]
         raster=15, resource=new_uuid(), partly_available=True, timezone='UTC'
     )
 
@@ -227,7 +234,12 @@ def test_limit_timespan():
     )
 
 
-def add_reservation(scheduler, allocation, start, end):
+def add_reservation(
+    scheduler: Scheduler,
+    allocation: Allocation,
+    start: datetime,
+    end: datetime
+) -> None:
     # small helper to reserve all the slots between start and end
     reservation = new_uuid()
     for s, e in allocation.all_slots():
@@ -246,14 +258,14 @@ def add_reservation(scheduler, allocation, start, end):
     scheduler.session.refresh(allocation)
 
 
-def test_availability_partitions(scheduler):
-    allocation = Allocation(
+def test_availability_partitions(scheduler: Scheduler) -> None:
+    allocation = Allocation(  # type: ignore[misc]
         raster=15, resource=new_uuid(), partly_available=True,
         timezone='Europe/Zurich'
     )
     allocation.start = datetime(2022, 9, 29, 22, tzinfo=utc)
     allocation.end = datetime(2022, 9, 30, 1, 59, 59, 999999, tzinfo=utc)
-    allocation.group = new_uuid().hex
+    allocation.group = new_uuid()
     allocation.mirror_of = scheduler.resource
     scheduler.session.add(allocation)
     scheduler.session.flush()
@@ -281,14 +293,14 @@ def test_availability_partitions(scheduler):
     assert allocation.availability == 75.0
 
 
-def test_availability_partitions_dst_to_st(scheduler):
-    allocation = Allocation(
+def test_availability_partitions_dst_to_st(scheduler: Scheduler) -> None:
+    allocation = Allocation(  # type: ignore[misc]
         raster=15, resource=new_uuid(), partly_available=True,
         timezone='Europe/Zurich'
     )
     allocation.start = datetime(2022, 10, 29, 22, tzinfo=utc)
     allocation.end = datetime(2022, 10, 30, 2, 59, 59, 999999, tzinfo=utc)
-    allocation.group = new_uuid().hex
+    allocation.group = new_uuid()
     allocation.mirror_of = scheduler.resource
     scheduler.session.add(allocation)
     scheduler.session.flush()
@@ -337,15 +349,18 @@ def test_availability_partitions_dst_to_st(scheduler):
     assert allocation.availability == 60.0
 
 
-def test_availability_partitions_dst_to_st_during_ambiguous_time(scheduler):
-    allocation = Allocation(
+def test_availability_partitions_dst_to_st_during_ambiguous_time(
+    scheduler: Scheduler
+) -> None:
+
+    allocation = Allocation(  # type: ignore[misc]
         raster=5, resource=new_uuid(), partly_available=True,
         timezone='Europe/Zurich'
     )
     # our allocation starts during the ambigious time period we skip
     allocation.start = datetime(2022, 10, 30, 0, 40, tzinfo=utc)
     allocation.end = datetime(2022, 10, 30, 22, 59, 59, 999999, tzinfo=utc)
-    allocation.group = new_uuid().hex
+    allocation.group = new_uuid()
     allocation.mirror_of = scheduler.resource
     scheduler.session.add(allocation)
     scheduler.session.flush()
@@ -365,14 +380,14 @@ def test_availability_partitions_dst_to_st_during_ambiguous_time(scheduler):
     assert allocation.normalized_availability == 75.0
 
 
-def test_availability_partitions_st_to_dst(scheduler):
-    allocation = Allocation(
+def test_availability_partitions_st_to_dst(scheduler: Scheduler) -> None:
+    allocation = Allocation(  # type: ignore[misc]
         raster=15, resource=new_uuid(), partly_available=True,
         timezone='Europe/Zurich'
     )
     allocation.start = datetime(2022, 3, 26, 23, tzinfo=utc)
     allocation.end = datetime(2022, 3, 27, 2, 59, 59, 999999, tzinfo=utc)
-    allocation.group = new_uuid().hex
+    allocation.group = new_uuid()
     allocation.mirror_of = scheduler.resource
     scheduler.session.add(allocation)
     scheduler.session.flush()

{libres-0.9.0 → libres-0.9.1}/tests/test_registry.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import threading
 import pytest
 import random
@@ -6,9 +8,10 @@ from libres.modules import errors
 from libres.context.registry import Registry
 
 
-def test_registry_contexts():
+def test_registry_contexts() -> None:
     r = Registry()
 
+    assert r.master_context is not None
     assert r.master_context.name == 'master'
     assert r.master_context is r.current_context
     assert r.is_existing_context('master')
@@ -36,7 +39,7 @@ def test_registry_contexts():
     assert r.current_context.name == 'bar'
 
 
-def test_autocreate():
+def test_autocreate() -> None:
     r = Registry()
 
     ctx = r.get_context('yo', autocreate=True)
@@ -45,7 +48,7 @@ def test_autocreate():
     assert r.get_context('yo') is ctx
 
 
-def test_assert_existence():
+def test_assert_existence() -> None:
     r = Registry()
 
     with pytest.raises(errors.UnknownContext):
@@ -57,7 +60,7 @@ def test_assert_existence():
         r.assert_does_not_exist('foo')
 
 
-def test_replace():
+def test_replace() -> None:
     r = Registry()
 
     ctx = r.register_context('gabba gabba')
@@ -74,7 +77,7 @@ def test_replace():
         ctx = r.register_context('gabba gabba', replace=True)
 
 
-def test_different_registries():
+def test_different_registries() -> None:
     r1 = Registry()
     r2 = Registry()
 
@@ -84,7 +87,7 @@ def test_different_registries():
     r2.register_context('foo')
 
 
-def test_locked_contexts():
+def test_locked_contexts() -> None:
     r = Registry()
 
     context = r.register_context('test')
@@ -95,9 +98,10 @@ def test_locked_contexts():
         context.set('foo', 'bar')
 
 
-def test_master_fallback():
+def test_master_fallback() -> None:
     r = Registry()
 
+    assert r.master_context is not None
     r.master_context.set_setting('host', 'localhost')
     assert r.master_context.get_setting('host') == 'localhost'
 
@@ -116,9 +120,10 @@ def test_master_fallback():
     assert another_app.get_setting('host') == 'localhost'
 
 
-def test_services():
+def test_services() -> None:
     r = Registry()
 
+    assert r.master_context is not None
     r.master_context.set_service('service', factory=lambda ctx: object())
     first_call = r.master_context.get_service('service')
     second_call = r.master_context.get_service('service')
@@ -126,9 +131,10 @@ def test_services():
     assert first_call is not second_call
 
 
-def test_services_cache():
+def test_services_cache() -> None:
     r = Registry()
 
+    assert r.master_context is not None
     r.master_context.set_service(
         'service', factory=lambda ctx: object(), cache=True
     )
@@ -139,17 +145,17 @@ def test_services_cache():
     assert first_call is second_call
 
 
-def test_threading_contexts():
+def test_threading_contexts() -> None:
     r = Registry()
 
     class Application(threading.Thread):
 
-        def __init__(self, name, registry):
+        def __init__(self, name: str, registry: Registry) -> None:
             threading.Thread.__init__(self)
             self.registry = registry
             self.name = name
 
-        def run(self):
+        def run(self) -> None:
             if self.registry.is_existing_context(self.name):
                 self.registry.get_context(self.name).switch_to()
             else:
@@ -157,7 +163,7 @@ def test_threading_contexts():
 
             self.result = self.registry.get_current_context().name
 
-        def join(self):
+        def join(self) -> str:  # type: ignore[override]
             threading.Thread.join(self)
             return self.result
 

{libres-0.9.0 → libres-0.9.1}/tests/test_reservation.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from datetime import datetime, timedelta
@@ -7,16 +9,21 @@ from sedate import standardize_date
 from uuid import uuid4
 
 
-def test_reservation_title():
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from libres.db.scheduler import Scheduler
+
+
+def test_reservation_title() -> None:
     assert Reservation(email='test@example.org').title == 'test@example.org'
 
 
-def test_unknown_target_type():
+def test_unknown_target_type() -> None:
     with pytest.raises(NotImplementedError):
-        Reservation(target_type='foo').timespans()
+        Reservation(target_type='foo').timespans()  # type: ignore[misc]
 
 
-def test_reservation_timespans(scheduler):
+def test_reservation_timespans(scheduler: Scheduler) -> None:
     start = datetime(2015, 2, 5, 15)
     end = datetime(2015, 2, 5, 16)
 
@@ -33,7 +40,7 @@ def test_reservation_timespans(scheduler):
     assert timespans[0].end == reservation.end + timedelta(microseconds=1)
 
 
-def test_group_reservation_timespans(scheduler):
+def test_group_reservation_timespans(scheduler: Scheduler) -> None:
     dates = [
         (datetime(2015, 2, 5, 15), datetime(2015, 2, 5, 16)),
         (datetime(2015, 2, 6, 15), datetime(2015, 2, 6, 16))
@@ -57,7 +64,7 @@ def test_group_reservation_timespans(scheduler):
         - timedelta(microseconds=1)
 
 
-def test_overlapping_reservations(scheduler):
+def test_overlapping_reservations(scheduler: Scheduler) -> None:
     start = datetime(2015, 2, 5, 15)
     end = datetime(2015, 2, 5, 16)