libres 0.7.3__tar.gz → 0.8.0__tar.gz

{libres-0.7.3 → libres-0.8.0}/HISTORY.rst

@@ -1,6 +1,18 @@
 Changelog
 ---------
 
+0.8.0 (15.01.2025)
+~~~~~~~~~~~~~~~~~~~
+
+- Adds support for Python 3.13
+  [Daverball]
+
+- Drops support for Python 3.8
+  [Daverball]
+
+- Modernizes type hints
+  [Daverball]
+
 0.7.3 (2024-08-21)
 ~~~~~~~~~~~~~~~~~~~
 

{libres-0.7.3/src/libres.egg-info → libres-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: libres
-Version: 0.7.3
+Version: 0.8.0
 Summary: A library to reserve things
 Home-page: http://github.com/seantis/libres/
 Author: Denis Krienbühl
@@ -14,13 +14,13 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-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: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: python-dateutil
@@ -30,10 +30,15 @@ Requires-Dist: sedate>=1.0.0
 Requires-Dist: SQLAlchemy<2,>=0.9
 Provides-Extra: dev
 Requires-Dist: bandit[toml]; extra == "dev"
+Requires-Dist: bump-my-version; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
-Requires-Dist: flake8-bugbear; extra == "dev"
+Requires-Dist: flake8-type-checking; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pre-commit-uv; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: uv; extra == "dev"
 Requires-Dist: tox; extra == "dev"
+Requires-Dist: tox-uv; extra == "dev"
 Provides-Extra: test
 Requires-Dist: jsonpickle; extra == "test"
 Requires-Dist: pytest; extra == "test"
@@ -91,19 +96,19 @@ Run the Tests
 
 Install tox and run it::
 
-    pip install tox
+    pip install tox tox-uv
     tox
 
 Limit the tests to a specific python version::
 
-    tox -e py27
+    tox -e py311
 
 Conventions
 -----------
 
 Libres follows PEP8 as close as possible. To test for it run::
 
-    tox -e pep8
+    tox -e ruff,flake8
 
 Libres uses `Semantic Versioning <http://semver.org/>`_
 
@@ -128,7 +133,7 @@ Making a new Release
 
 Make sure all changes are in the HISTORY.rst, then bump the version::
 
-    bump2version major|minor|patch
+    bump-my-version bump major|minor|patch
     git push && git push --tags
 
 After this, create a new release on Github.
@@ -136,6 +141,18 @@ After this, create a new release on Github.
 Changelog
 ---------
 
+0.8.0 (15.01.2025)
+~~~~~~~~~~~~~~~~~~~
+
+- Adds support for Python 3.13
+  [Daverball]
+
+- Drops support for Python 3.8
+  [Daverball]
+
+- Modernizes type hints
+  [Daverball]
+
 0.7.3 (2024-08-21)
 ~~~~~~~~~~~~~~~~~~~
 

{libres-0.7.3 → libres-0.8.0}/README.rst

@@ -42,19 +42,19 @@ Run the Tests
 
 Install tox and run it::
 
-    pip install tox
+    pip install tox tox-uv
     tox
 
 Limit the tests to a specific python version::
 
-    tox -e py27
+    tox -e py311
 
 Conventions
 -----------
 
 Libres follows PEP8 as close as possible. To test for it run::
 
-    tox -e pep8
+    tox -e ruff,flake8
 
 Libres uses `Semantic Versioning <http://semver.org/>`_
 
@@ -79,7 +79,7 @@ Making a new Release
 
 Make sure all changes are in the HISTORY.rst, then bump the version::
 
-    bump2version major|minor|patch
+    bump-my-version bump major|minor|patch
     git push && git push --tags
 
 After this, create a new release on Github.

libres-0.8.0/pyproject.toml

@@ -0,0 +1,285 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.pytest.ini_options]
+log_level = "INFO"
+testpaths = ["tests"]
+
+[tool.coverage.run]
+branch = true
+source = ["src"]
+
+[tool.bumpversion]
+current_version = "0.8.0"
+commit = true
+message = "Release {new_version}"
+tag = true
+tag_message = "Release {new_version}"
+
+[[tool.bumpversion.files]]
+filename = "src/libres/__init__.py"
+search= "__version__ = '{current_version}'"
+replace= "__version__ = '{new_version}'"
+
+[[tool.bumpversion.files]]
+filename = "HISTORY.rst"
+search = """
+---------
+"""
+replace = """
+---------
+
+{new_version} ({now:%d.%m.%Y})
+~~~~~~~~~~~~~~~~~~~
+"""
+
+[tool.mypy]
+python_version = "3.9"
+follow_imports = "silent"
+namespace_packages = true
+explicit_package_bases = true
+warn_unused_ignores = true
+warn_redundant_casts = true
+warn_unreachable = true
+disallow_any_generics = true
+disallow_untyped_defs = true
+plugins = "sqlmypy"
+mypy_path = "$MYPY_CONFIG_FILE_DIR/src"
+
+[tool.bandit]
+exclude_dirs = ["tests"]
+skips = ["B101"]
+
+[tool.ruff]
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".git-rewrite",
+    ".hg",
+    ".ipynb_checkpoints",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pyenv",
+    ".pytest_cache",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    ".vscode",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "site-packages",
+    "venv",
+]
+src = ["src", "tests"]
+include = [
+    "pyproject.toml",
+    "src/**/*.py",
+    "tests/**/*.py",
+    "stubs/**/*.pyi"
+]
+line-length = 79
+indent-width = 4
+target-version = "py39"
+
+[tool.ruff.lint]
+select = [
+    "B0",
+    "B904",
+    "B909",
+    "C4",
+    "COM818",
+    "D2",
+    "D301",
+    "D4",
+    "E",
+    "F",
+    "FLY002",
+    "I002",
+    "ISC",
+    "N",
+    "PERF",
+    "PGH004",
+    "PIE",
+    "PYI",
+    "Q",
+    "RUF",
+    "SIM",
+    "SLOT",
+    "UP",
+    "W"
+]
+ignore = [
+    "B007",
+    "C420",
+    "D200",
+    "D201",
+    "D202",
+    "D204",
+    "D205",
+    "D209",
+    "D210",
+    "D211",
+    "D400",
+    "D401",
+    "D412",
+    "E226",
+    "E402",
+    "E711",
+    "E712",
+    "E741",
+    "N818",
+    "PYI019",
+    "PYI041",
+    "RUF012",
+    "RUF013",
+    "RUF021",
+    "RUF022",
+    "RUF023",
+    "RUF031",
+    "RUF052",
+    "RUF056",
+    "SIM103",
+    "SIM105",
+    "SIM108",
+    "SIM110",
+    "SIM118",
+    "SIM210",
+    "SIM910",
+    "UP009",
+    "UP012",
+    "UP032",
+    "UP038",
+]
+unfixable = []
+external = ["TC"]
+allowed-confusables = ["×"]
+preview = true
+
+[tool.ruff.lint.extend-per-file-ignores]
+"tests/**/*.py" = [
+    "C4",
+    "D",
+    "FLY002",
+    "I002",
+    "ISC",
+    "N",
+    "Q",
+    "PERF",
+    "PGH",
+    "PIE",
+    "PYI",
+    "RUF",
+    "SIM",
+    "UP",
+]
+
+[tool.ruff.lint.isort]
+required-imports = ["from __future__ import annotations"]
+
+[tool.ruff.lint.pep8-naming]
+extend-ignore-names = [
+    "afterFlowable",
+    "HSTORE",
+    "sortKey",
+    "URL",
+    "UUID"
+]
+classmethod-decorators = [
+    # NOTE: We can potentially get rid some of these with SQLAlchemy 2.0
+    #       since they should cleanly combine with classmethod
+    "declared_attr",
+    "expression",
+    "comparator",
+]
+
+[tool.ruff.lint.pydocstyle]
+convention = "pep257"
+ignore-decorators = ["typing.overload"]
+
+[tool.ruff.lint.flake8-quotes]
+avoid-escape = true
+docstring-quotes = "double"
+inline-quotes = "single"
+multiline-quotes = "double"
+
+[tool.ruff.format]
+quote-style = "single"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "lf"
+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
+
+[testenv]
+usedevelop = true
+setenv =
+    py{39,310,311,312,313}: COVERAGE_FILE = .coverage.{envname}
+deps =
+    -e{toxinidir}[test]
+commands = pytest --cov --cov-report= {posargs}
+
+[testenv:ruff]
+basepython = python3.11
+skip_install = true
+deps =
+    ruff
+commands = ruff check
+
+[testenv:flake8]
+basepython = python3.11
+skip_install = true
+deps =
+    flake8
+    flake8-type-checking
+commands = flake8 src/ tests/
+
+[testenv:bandit]
+basepython = python3.11
+skip_install = true
+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
+skip_install = true
+commands =
+    coverage combine
+    coverage report -m
+
+"""

{libres-0.7.3 → libres-0.8.0}/setup.cfg

@@ -18,15 +18,15 @@ classifiers =
 	Operating System :: OS Independent
 	Programming Language :: Python
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
+	Programming Language :: Python :: 3.13
 	Topic :: Software Development :: Libraries :: Python Modules
 
 [options]
-python_requires = >= 3.8
+python_requires = >= 3.9
 include_package_data = True
 package_dir = 
 	= src
@@ -47,10 +47,15 @@ libres =
 [options.extras_require]
 dev = 
 	bandit[toml]
+	bump-my-version
 	flake8
-	flake8-bugbear
+	flake8-type-checking
 	pre-commit
+	pre-commit-uv
+	ruff
+	uv
 	tox
+	tox-uv
 test = 
 	jsonpickle
 	pytest
@@ -65,9 +70,11 @@ mypy =
 	typing-extensions
 
 [flake8]
-ignore = E704,E712,W504
-extend-select = B901,B903,B904,B908
-exclude = .venv,.git,.tox,dist,docs,*lib/python*,*egg,build
+select = TC0,TC1
+per_file_ignores = 
+	*.pyi: TC
+	tests/**.py: TC
+exclude = .venv,venv,.git,.tox,dist,docs,*lib/python*,*egg,build
 
 [egg_info]
 tag_build = 

{libres-0.7.3 → libres-0.8.0}/src/libres/__init__.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
 from libres.context.registry import create_default_registry
 from libres.db import new_scheduler
 
 registry = create_default_registry()
 
-__version__ = '0.7.3'
+__version__ = '0.8.0'
 __all__ = (
     'new_scheduler',
     'registry'

{libres-0.7.3 → libres-0.8.0}/src/libres/context/core.py

@@ -1,17 +1,23 @@
+from __future__ import annotations
+
 import enum
 import libres
 import threading
-
 from contextlib import contextmanager
 from functools import cached_property
 
 from libres.modules import errors
 
 
-import typing as _t
-if _t.TYPE_CHECKING:
+from typing import Any
+from typing import Literal
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from collections.abc import Callable
+    from collections.abc import Iterator
     from sqlalchemy.orm import Session
     from sqlalchemy.orm.session import SessionTransaction
+    from typing_extensions import TypeAlias
     from uuid import UUID
 
     from libres.context.registry import Registry
@@ -24,8 +30,8 @@ class _Marker(enum.Enum):
     required = enum.auto()
 
 
-missing_t = _t.Literal[_Marker.missing]
-required_t = _t.Literal[_Marker.required]
+missing_t: TypeAlias = Literal[_Marker.missing]  # noqa: PYI042
+required_t: TypeAlias = Literal[_Marker.required]  # noqa: PYI042
 missing: missing_t = _Marker.missing
 required: required_t = _Marker.required
 
@@ -51,18 +57,18 @@ class ContextServicesMixin:
 
     """
 
-    context: 'Context'
+    context: Context
 
     @cached_property
-    def is_allocation_exposed(self) -> _t.Callable[['Allocation'], bool]:
+    def is_allocation_exposed(self) -> Callable[[Allocation], bool]:
         return self.context.get_service('exposure').is_allocation_exposed
 
     @cached_property
-    def generate_uuid(self) -> _t.Callable[[str], 'UUID']:
+    def generate_uuid(self) -> Callable[[str], UUID]:
         return self.context.get_service('uuid_generator')
 
     @cached_property
-    def validate_email(self) -> _t.Callable[[str], bool]:
+    def validate_email(self) -> Callable[[str], bool]:
         return self.context.get_service('email_validator')
 
     def clear_cache(self) -> None:
@@ -84,11 +90,11 @@ class ContextServicesMixin:
             pass
 
     @property
-    def session_provider(self) -> 'SessionProvider':
+    def session_provider(self) -> SessionProvider:
         return self.context.get_service('session_provider')
 
     @property
-    def session(self) -> 'Session':
+    def session(self) -> Session:
         """ Returns the current session. """
         return self.session_provider.session()
 
@@ -97,7 +103,7 @@ class ContextServicesMixin:
         self.session.close()
 
     @property
-    def begin_nested(self) -> _t.Callable[[], 'SessionTransaction']:
+    def begin_nested(self) -> Callable[[], SessionTransaction]:
         return self.session.begin_nested
 
     def commit(self) -> None:
@@ -143,13 +149,13 @@ class Context:
     def __init__(
         self,
         name: str,
-        registry: _t.Optional['Registry'] = None,
-        parent: _t.Optional['Context'] = None,
+        registry: Registry | None = None,
+        parent: Context | None = None,
         locked: bool = False
     ):
         self.name = name
         self.registry = registry or libres.registry
-        self.values: _t.Dict[str, _t.Any] = {}
+        self.values: dict[str, Any] = {}
         self.parent = parent
         self.locked = False
         self.thread_lock = threading.RLock()
@@ -158,7 +164,7 @@ class Context:
         return f"<Libres Context(name='{self.name}')>"
 
     @contextmanager
-    def as_current_context(self) -> _t.Iterator[None]:
+    def as_current_context(self) -> Iterator[None]:
         with self.registry.context(self.name):
             yield
 
@@ -173,7 +179,7 @@ class Context:
         with self.thread_lock:
             self.locked = False
 
-    def get(self, key: str) -> _t.Union[_t.Any, missing_t]:
+    def get(self, key: str) -> Any | missing_t:
         if key in self.values:
             return self.values[key]
         elif self.parent:
@@ -181,7 +187,7 @@ class Context:
         else:
             return missing
 
-    def set(self, key: str, value: _t.Any) -> None:
+    def set(self, key: str, value: Any) -> None:
         if self.locked:
             raise errors.ContextIsLocked
 
@@ -195,21 +201,21 @@ class Context:
 
             self.values[key] = value
 
-    def get_setting(self, name: str) -> _t.Any:
+    def get_setting(self, name: str) -> Any:
         return self.get(f'settings.{name}')
 
-    def set_setting(self, name: str, value: _t.Any) -> None:
+    def set_setting(self, name: str, value: Any) -> None:
         with self.thread_lock:
             self.set(f'settings.{name}', value)
 
-    def get_service(self, name: str) -> _t.Any:
-        service_id = '/'.join(('service', name))
+    def get_service(self, name: str) -> Any:
+        service_id = f'service/{name}'
         service = self.get(service_id)
 
         if service is missing:
             raise errors.UnknownService(service_id)
 
-        cache_id = '/'.join(('service', name, 'cache'))
+        cache_id = f'service/{name}/cache'
         cache = self.get(cache_id)
 
         # no cache
@@ -226,13 +232,13 @@ class Context:
     def set_service(
         self,
         name: str,
-        factory: _t.Callable[..., _t.Any],
+        factory: Callable[..., Any],
         cache: bool = False
     ) -> None:
         with self.thread_lock:
-            service_id = '/'.join(('service', name))
+            service_id = f'service/{name}'
             self.set(service_id, factory)
 
             if cache:
-                cache_id = '/'.join(('service', name, 'cache'))
+                cache_id = f'service/{name}/cache'
                 self.set(cache_id, required)

libres-0.8.0/src/libres/context/exposure.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+
+from typing import Literal
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from libres.db.models import Allocation
+
+
+class Exposure:
+    @staticmethod
+    def is_allocation_exposed(allocation: Allocation) -> Literal[True]:
+        return True