libres 0.7.1__py3-none-any.whl → 0.7.3__py3-none-any.whl

libres/__init__.py

@@ -3,7 +3,7 @@ from libres.db import new_scheduler
 
 registry = create_default_registry()
 
-__version__ = '0.7.1'
+__version__ = '0.7.3'
 __all__ = (
     'new_scheduler',
     'registry'

libres/db/scheduler.py

@@ -18,6 +18,7 @@ from libres.modules import utils
 
 import typing as _t
 if _t.TYPE_CHECKING:
+    from sedate.types import DateLike
     from sqlalchemy.orm import Query
     from typing_extensions import NotRequired, Self, TypeAlias, TypedDict
 
@@ -893,8 +894,8 @@ class Scheduler(ContextServicesMixin):
 
     def remove_unused_allocations(
         self,
-        start: datetime,
-        end: datetime,
+        start: 'DateLike',
+        end: 'DateLike',
         days: _t.Optional[_t.Iterable[_t.Union['Day', 'DayNumber']]] = None,
         exclude_groups: bool = False
     ) -> int:
@@ -916,7 +917,7 @@ class Scheduler(ContextServicesMixin):
             be excluded, regardless of what this parameter is set to.
         """
 
-        start, end = self._prepare_range(
+        start_dt, end_dt = self._prepare_range(
             sedate.as_datetime(start),
             sedate.as_datetime(end)
         )
@@ -957,22 +958,22 @@ class Scheduler(ContextServicesMixin):
             groups = groups.having(
                 and_(
                     func.count(Allocation.id) == 1,
-                    start <= func.min(Allocation._start),
-                    func.max(Allocation._end) <= end
+                    start_dt <= func.min(Allocation._start),
+                    func.max(Allocation._end) <= end_dt
                 )
             )
         else:
             groups = groups.having(
                 and_(
-                    start <= func.min(Allocation._start),
-                    func.max(Allocation._end) <= end
+                    start_dt <= func.min(Allocation._start),
+                    func.max(Allocation._end) <= end_dt
                 )
             )
 
         # all allocations
         candidates = self.managed_allocations()
-        candidates = candidates.filter(start <= Allocation._start)
-        candidates = candidates.filter(Allocation._end <= end)
+        candidates = candidates.filter(start_dt <= Allocation._start)
+        candidates = candidates.filter(Allocation._end <= end_dt)
 
         # .. without the ones with slots
         candidates = candidates.filter(not_(Allocation.id.in_(slots)))

{libres-0.7.1.dist-info → libres-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libres
-Version: 0.7.1
+Version: 0.7.3
 Summary: A library to reserve things
 Home-page: http://github.com/seantis/libres/
 Author: Denis Krienbühl
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
@@ -25,26 +26,26 @@ License-File: LICENSE
 Requires-Dist: python-dateutil
 Requires-Dist: psycopg2-binary
 Requires-Dist: pytz
-Requires-Dist: sedate >=1.0.0
-Requires-Dist: SQLAlchemy <2,>=0.9
+Requires-Dist: sedate>=1.0.0
+Requires-Dist: SQLAlchemy<2,>=0.9
 Provides-Extra: dev
-Requires-Dist: bandit[toml] ; extra == 'dev'
-Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: flake8-bugbear ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Requires-Dist: tox ; extra == 'dev'
+Requires-Dist: bandit[toml]; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: flake8-bugbear; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: tox; extra == "dev"
 Provides-Extra: mypy
-Requires-Dist: mypy ; extra == 'mypy'
-Requires-Dist: sqlalchemy-stubs ; extra == 'mypy'
-Requires-Dist: types-psycopg2 ; extra == 'mypy'
-Requires-Dist: types-python-dateutil ; extra == 'mypy'
-Requires-Dist: types-pytz ; extra == 'mypy'
-Requires-Dist: typing-extensions ; extra == 'mypy'
+Requires-Dist: mypy; extra == "mypy"
+Requires-Dist: sqlalchemy-stubs; extra == "mypy"
+Requires-Dist: types-psycopg2; extra == "mypy"
+Requires-Dist: types-python-dateutil; extra == "mypy"
+Requires-Dist: types-pytz; extra == "mypy"
+Requires-Dist: typing-extensions; extra == "mypy"
 Provides-Extra: test
-Requires-Dist: jsonpickle ; extra == 'test'
-Requires-Dist: pytest ; extra == 'test'
-Requires-Dist: pytest-codecov[git] ; extra == 'test'
-Requires-Dist: testing.postgresql ; extra == 'test'
+Requires-Dist: jsonpickle; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-codecov[git]; extra == "test"
+Requires-Dist: testing.postgresql; extra == "test"
 
 Libres
 ======
@@ -135,6 +136,18 @@ After this, create a new release on Github.
 Changelog
 ---------
 
+0.7.3 (2024-08-21)
+~~~~~~~~~~~~~~~~~~~
+
+- Adds support for Python 3.12.
+  [Daverball]
+
+0.7.2 (2024-02-07)
+~~~~~~~~~~~~~~~~~~~
+
+- Fixes another incorrect type annotation in `Scheduler`.
+  [Daverball]
+
 0.7.1 (2024-01-18)
 ~~~~~~~~~~~~~~~~~~~
 

{libres-0.7.1.dist-info → libres-0.7.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 libres/.gitignore,sha256=tyWYoDW7-zMdsfiJIVONRWJ5JmqJCTHzBOsi_rkIYZg,49
-libres/__init__.py,sha256=N9x5NDwywqesaFCjJhGUN_yVxXmSh6Op_FIrXGzLF64,207
+libres/__init__.py,sha256=gZ1PsCC77HhOe3BNP2M-JThC0Yx3p_2FMdmrke9n3VQ,207
 libres/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 libres/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 libres/context/core.py,sha256=KHM0kEWtUx8OEBhkhjYMzgYQde5tO7VwvKMSvOWvd9U,7054
@@ -9,7 +9,7 @@ libres/context/session.py,sha256=3aTj7Tt_xSSxCn3NqpLFnJkFfj6Eusovzx-JZLcz4FI,247
 libres/context/settings.py,sha256=JNMVWRdXfqdbxgiXp8nivBI49mF8J-Q5xi3Ui-_op-Q,1322
 libres/db/__init__.py,sha256=FUqf3TZ5WGnOlOXXDfgfG8VBrzirfTR82eePQS53naU,95
 libres/db/queries.py,sha256=V0L-QJlRkt30k6qHriwMkNGX2MU8idWreVPgsYiaZV0,10864
-libres/db/scheduler.py,sha256=hFp0H1bi9VC0FMCO9Y3qF22JY2RWIdLUgs8Q6y3fnL4,64549
+libres/db/scheduler.py,sha256=og5cDFvRNATMj-U9UGYZVj0aqxKtsWpm2ne_Ic0mj3I,64615
 libres/db/models/__init__.py,sha256=OvQEL2iMk1GbeXyCz8rQGv0mBvzol2C3wRsDVa9zJWY,289
 libres/db/models/allocation.py,sha256=UWwXVtb-b_9dyVVXZ_Bo0vqGIK0xbgxmvfBDl3uYQHs,28675
 libres/db/models/base.py,sha256=UPY_Z6G4bNhkIur1d04gb4KfBrEk2ZpE0lY8bNJrhkg,81
@@ -26,8 +26,8 @@ libres/modules/errors.py,sha256=0cRiCKHekaLj0_RVdt6H-VP7dSkI3TQTzjX8u7VUOrI,2120
 libres/modules/events.py,sha256=n1RdSmCuhCccmeKk5dOoQ-1q75f-uJh9dIcY2h33cIg,5283
 libres/modules/rasterizer.py,sha256=9Bvp4uSCOtAW8XIfPukjwnTaine1iyFQAHH3uXZiHVo,3006
 libres/modules/utils.py,sha256=Xy_U6074hEY_EwVGJyFqYWI4zL2Mv0-JS5bGW7S7s0M,1793
-libres-0.7.1.dist-info/LICENSE,sha256=w1rojULT3naueSnr4r62MSQipL4VPtsfEcTFmSKpVuI,1069
-libres-0.7.1.dist-info/METADATA,sha256=2VTULI1rcl1aKPobVp2KbDFmrqNOGLeLorFtoWZGyBk,8968
-libres-0.7.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-libres-0.7.1.dist-info/top_level.txt,sha256=Exs6AnhZc0UTcsD5Ylyx1P89j19hJ4Dy13jxQyZwi3k,7
-libres-0.7.1.dist-info/RECORD,,
+libres-0.7.3.dist-info/LICENSE,sha256=w1rojULT3naueSnr4r62MSQipL4VPtsfEcTFmSKpVuI,1069
+libres-0.7.3.dist-info/METADATA,sha256=ek0WQ0MaY_WvOf0u3UUtOKn2GUuplGkZ-RDfp30JIPk,9202
+libres-0.7.3.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+libres-0.7.3.dist-info/top_level.txt,sha256=Exs6AnhZc0UTcsD5Ylyx1P89j19hJ4Dy13jxQyZwi3k,7
+libres-0.7.3.dist-info/RECORD,,

{libres-0.7.1.dist-info → libres-0.7.3.dist-info}/WHEEL

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