From ddce076d50d96ab27c3ae1a41b31b99f5065b2d9 Mon Sep 17 00:00:00 2001 From: Vytautas Liuolia Date: Tue, 7 May 2024 09:42:05 +0200 Subject: [PATCH] chore(CI): pin `pytest` + ASGI tutorial fixes --- docs/user/tutorial-asgi.rst | 5 +---- examples/asgilook/asgilook/store.py | 2 +- requirements/tests | 5 ++++- tox.ini | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/user/tutorial-asgi.rst b/docs/user/tutorial-asgi.rst index 65ffa2fa9..dff2206b2 100644 --- a/docs/user/tutorial-asgi.rst +++ b/docs/user/tutorial-asgi.rst @@ -180,13 +180,12 @@ We can now implement a basic async image store. Save the following code as class Image: - def __init__(self, config, image_id, size): self._config = config self.image_id = image_id self.size = size - self.modified = datetime.datetime.utcnow() + self.modified = datetime.datetime.now(datetime.timezone.utc) @property def path(self): @@ -206,7 +205,6 @@ We can now implement a basic async image store. Save the following code as class Store: - def __init__(self, config): self._config = config self._images = {} @@ -272,7 +270,6 @@ of images. Place the code below in a file named ``images.py``: class Images: - def __init__(self, config, store): self._config = config self._store = store diff --git a/examples/asgilook/asgilook/store.py b/examples/asgilook/asgilook/store.py index 2633f0ac0..faf873c91 100644 --- a/examples/asgilook/asgilook/store.py +++ b/examples/asgilook/asgilook/store.py @@ -13,7 +13,7 @@ def __init__(self, config, image_id, size): self.image_id = image_id self.size = size - self.modified = datetime.datetime.utcnow() + self.modified = datetime.datetime.now(datetime.timezone.utc) @property def path(self): diff --git a/requirements/tests b/requirements/tests index 19b34bcd3..e3623da8d 100644 --- a/requirements/tests +++ b/requirements/tests @@ -1,5 +1,8 @@ coverage >= 4.1 -pytest +# TODO(vytas): Our use of testtools breaks under pytest 8.2 along the lines of +# https://github.com/pytest-dev/pytest/issues/12263, unpin when fixed +# (or drop support for testtools altogether?) +pytest >= 7.0, < 8.2 pyyaml requests # TODO(vytas): Check if testtools still brings anything to the table, and diff --git a/tox.ini b/tox.ini index 0e6dcd477..e6ca31342 100644 --- a/tox.ini +++ b/tox.ini @@ -435,7 +435,6 @@ commands = # -------------------------------------------------------------------- [testenv:look] -basepython = python3.10 deps = -r{toxinidir}/examples/look/requirements/test commands = @@ -446,7 +445,7 @@ commands = # -------------------------------------------------------------------- [testenv:asgilook] -basepython = python3.10 +basepython = python3.12 deps = -r{toxinidir}/examples/asgilook/requirements/asgilook -r{toxinidir}/examples/asgilook/requirements/test