Update upstream source from tag 'upstream/2.12.0'

Update to upstream version '2.12.0'
with Debian dir 39f36d38b324fc88b811c1a8994e188459eb04fa

.github/workflows/ci.yaml

@@ -33,8 +33,8 @@ jobs:
       run: flake8
     - name: Prepare twine checker
       run: |
-        pip install -U twine wheel
-        python setup.py sdist bdist_wheel
+        pip install -U build twine wheel
+        python -m build
     - name: Run twine checker
       run: twine check dist/*
 

.isort.cfg

@@ -4,3 +4,4 @@ include_trailing_comma=True
 multi_line_output=3
 force_grid_wrap=0
 combine_as_imports=True
+known_first_party=aiohttp_session

.mypy.ini

@@ -27,9 +27,6 @@ disallow_any_unimported = False
 [mypy-aiopg.*]
 ignore_missing_imports = True
 
-[mypy-aioredis.*]
-ignore_missing_imports = True
-
 [mypy-aiomcache.*]
 ignore_missing_imports = True
 

.pre-commit-config.yaml

@@ -17,24 +17,24 @@ repos:
     pass_filenames: true
     types: [file, rst]
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: 'v4.0.1'
+  rev: 'v4.3.0'
   hooks:
   - id: check-merge-conflict
 - repo: https://github.com/asottile/yesqa
-  rev: v1.3.0
+  rev: v1.4.0
   hooks:
   - id: yesqa
 - repo: https://github.com/PyCQA/isort
-  rev: '5.9.3'
+  rev: '5.10.1'
   hooks:
   - id: isort
 - repo: https://github.com/psf/black
-  rev: '21.10b0'
+  rev: '22.10.0'
   hooks:
     - id: black
       language_version: python3
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: 'v4.0.1'
+  rev: 'v4.3.0'
   hooks:
   - id: end-of-file-fixer
     exclude: >-
@@ -66,16 +66,16 @@ repos:
   - id: detect-private-key
     exclude: ^examples/
 - repo: https://github.com/asottile/pyupgrade
-  rev: 'v2.29.0'
+  rev: 'v3.1.0'
   hooks:
   - id: pyupgrade
     args: ['--py36-plus']
 - repo: https://github.com/PyCQA/flake8
-  rev: '4.0.1'
+  rev: '5.0.4'
   hooks:
   - id: flake8
     exclude: "^docs/"
-- repo: git://github.com/Lucas-C/pre-commit-hooks-markup
+- repo: https://github.com/Lucas-C/pre-commit-hooks-markup
   rev: v1.0.1
   hooks:
   - id: rst-linter

CHANGES.txt

 .. towncrier release notes start
 
+2.12.0 (2022-10-28)
+===================
+
+* Migrated from `aioredis` to `redis` (if using redis without installing
+  `aiohttp-session[aioredis]` then it will be necessary to manually install `redis`).
+
 2.11.0 (2021-01-31)
 ===================
 

Makefile

@@ -7,7 +7,6 @@ setup:
 flake fmt:
 	python -m pre_commit run --all-files
 
-
 test:
 	py.test ./tests/
 

README.rst

 aiohttp_session
 ===============
-.. image:: https://travis-ci.com/aio-libs/aiohttp-session.svg?branch=master
-    :target: https://travis-ci.com/aio-libs/aiohttp-session
+.. image:: https://github.com/aio-libs/aiohttp-session/actions/workflows/ci.yaml/badge.svg?branch=master
+    :target: https://github.com/aio-libs/aiohttp-session/actions/workflows/ci.yaml
 .. image:: https://codecov.io/github/aio-libs/aiohttp-session/coverage.svg?branch=master
     :target: https://codecov.io/github/aio-libs/aiohttp-session
 .. image:: https://readthedocs.org/projects/aiohttp-session/badge/?version=latest
@@ -79,10 +79,8 @@ Available session storages are:
 
 * ``aiohttp_session.redis_storage.RedisStorage(redis_pool)`` -- stores
   JSON encoded data in *redis*, keeping only the redis key (a random UUID) in
-  the cookie. ``redis_pool`` is a ``aioredis`` pool object, created by
-  ``await aioredis.create_redis_pool(...)`` call.
-
-  Requires ``aioredis`` library (only versions ``1.0+`` are supported)::
+  the cookie. ``redis_pool`` is a ``redis`` object, created by
+  ``await aioredis.from_url(...)`` call.
 
       $ pip install aiohttp_session[aioredis]
 

aiohttp_session/__init__.py

 """User sessions for aiohttp.web."""
 
-__version__ = "2.11.0"
+__version__ = "2.12.0"
 
 import abc
 import json
@@ -304,7 +304,6 @@ class AbstractStorage(metaclass=abc.ABCMeta):
                 self._cookie_name, domain=params["domain"], path=params["path"]
             )
         else:
-            # Ignoring type for params until aiohttp#4238 is released
             response.set_cookie(self._cookie_name, cookie_data, **params)
 
 

aiohttp_session/redis_storage.py

 import json
 import uuid
-from distutils.version import StrictVersion
 from typing import Any, Callable, Optional
 
 from aiohttp import web
@@ -8,9 +7,17 @@ from aiohttp import web
 from . import AbstractStorage, Session
 
 try:
-    import aioredis
+    from redis import VERSION as REDIS_VERSION, asyncio as aioredis
 except ImportError:  # pragma: no cover
-    aioredis = None  # type: ignore[assignment]
+    try:
+        import aioredis  # type: ignore[import, no-redef]  # noqa: I900
+    except ImportError:
+        aioredis = None  # type: ignore[assignment]
+    else:
+        import warnings
+        warnings.warn("aioredis library is deprecated, please replace with redis.",
+                      DeprecationWarning)
+        REDIS_VERSION = (4, 3)
 
 
 class RedisStorage(AbstractStorage):
@@ -18,7 +25,7 @@ class RedisStorage(AbstractStorage):
 
     def __init__(
         self,
-        redis_pool: "aioredis.Redis",
+        redis_pool: "aioredis.Redis[bytes]",
         *,
         cookie_name: str = "AIOHTTP_SESSION",
         domain: Optional[str] = None,
@@ -43,13 +50,13 @@ class RedisStorage(AbstractStorage):
             decoder=decoder,
         )
         if aioredis is None:
-            raise RuntimeError("Please install aioredis")
+            raise RuntimeError("Please install redis")
         # May have installed aioredis separately (without aiohttp-session[aioredis]).
-        if StrictVersion(aioredis.__version__).version < (2, 0):
-            raise RuntimeError("aioredis<2.0 is not supported")
+        if REDIS_VERSION < (4, 3):
+            raise RuntimeError("redis<4.3 is not supported")
         self._key_factory = key_factory
         if not isinstance(redis_pool, aioredis.Redis):
-            raise TypeError(f"Expected aioredis.Redis got {type(redis_pool)}")
+            raise TypeError(f"Expected redis.asyncio.Redis got {type(redis_pool)}")
         self._redis = redis_pool
 
     async def load_session(self, request: web.Request) -> Session:
@@ -58,12 +65,12 @@ class RedisStorage(AbstractStorage):
             return Session(None, data=None, new=True, max_age=self.max_age)
         else:
             key = str(cookie)
-            data = await self._redis.get(self.cookie_name + "_" + key)
-            if data is None:
+            data_bytes = await self._redis.get(self.cookie_name + "_" + key)
+            if data_bytes is None:
                 return Session(None, data=None, new=True, max_age=self.max_age)
-            data = data.decode("utf-8")
+            data_str = data_bytes.decode("utf-8")
             try:
-                data = self._decoder(data)
+                data = self._decoder(data_str)
             except ValueError:
                 data = None
             return Session(key, data=data, new=False, max_age=self.max_age)
@@ -82,9 +89,9 @@ class RedisStorage(AbstractStorage):
                 key = str(key)
                 self.save_cookie(response, key, max_age=session.max_age)
 
-        data = self._encoder(self._get_session_data(session))
+        data_str = self._encoder(self._get_session_data(session))
         await self._redis.set(
             self.cookie_name + "_" + key,
-            data,
-            ex=session.max_age,  # type: ignore[arg-type]
+            data_str,
+            ex=session.max_age,
         )

debian/changelog

+python-aiohttp-session (2.12.0-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Replace python3-aioredis build-dependency with python3-redis.
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 30 Apr 2024 18:17:42 +0100
+
 python-aiohttp-session (2.11.0-1) unstable; urgency=medium
 
   * New upstream version

debian/control

@@ -6,7 +6,6 @@ Uploaders: Martin <debacle@debian.org>
 Build-Depends: debhelper-compat (= 13),
 	       dh-python,
 	       python3-aiohttp,
-	       python3-aioredis,
 	       python3-all,
 	       python3-attr,
 	       python3-chardet,
@@ -18,6 +17,7 @@ Build-Depends: debhelper-compat (= 13),
 	       python3-pytest-cov,
 	       python3-pytest-mock,
 	       python3-pytest-sugar,
+	       python3-redis,
 	       python3-sphinx,
 	       python3-yarl,
 Standards-Version: 4.1.5

debian/patches/privacy-breach-fixes.patch

-Description: fix documentation privacy breaches
-Author: Martin <debacle@debian.org>
+From: Martin <debacle@debian.org>
+Date: Tue, 30 Apr 2024 18:13:32 +0100
+Subject: fix documentation privacy breaches
+
 Origin: vendor
+Last-Update: 2019-12-22
+
 Last-Update: 2019-12-22
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ docs/conf.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index aa82e82..bed5f85 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -142,11 +142,11 @@
+@@ -142,11 +142,11 @@ html_theme_options = {
      "description": "user session support for aiohttp.web",
      "github_user": "aio-libs",
      "github_repo": "aiohttp-session",

debian/patches/use-local-docs-for-intersphinx-links.patch

-Description: use local docs for intersphinx links
-Author: Martin <debacle@debian.org>
+From: Martin <debacle@debian.org>
+Date: Tue, 30 Apr 2024 18:13:32 +0100
+Subject: use local docs for intersphinx links
+
 Origin: vendor
+Last-Update: 2019-12-22
+
 Last-Update: 2019-12-22
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ docs/conf.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index bed5f85..1a47e27 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -341,10 +341,5 @@
+@@ -341,10 +341,5 @@ texinfo_documents = [
  
  # Example configuration for intersphinx: refer to the Python standard library.
  intersphinx_mapping = {
 -    "https://docs.python.org/3": None,
 -    "https://aiohttp.readthedocs.io/en/stable": None,
--    "https://aioredis.readthedocs.io/en/latest": None,
+-    "https://redis.readthedocs.io/en/latest": None,
 -    # 'https://github.com/aio-libs/aiomcache': None,
 -    "http://cryptography.io/en/latest": None,
 -    "https://pynacl.readthedocs.io/en/latest": None,

demo/redis_storage.py

 import time
 from typing import AsyncIterator
 
-import aioredis
 from aiohttp import web
+from redis import asyncio as aioredis
 
 from aiohttp_session import get_session, setup
 from aiohttp_session.redis_storage import RedisStorage
@@ -18,10 +18,7 @@ async def handler(request: web.Request) -> web.Response:
 
 async def redis_pool(app: web.Application) -> AsyncIterator[None]:
     redis_address = "redis://127.0.0.1:6379"
-    async with aioredis.from_url(  # type: ignore[no-untyped-call]
-        redis_address,
-        timeout=1,
-    ) as redis:
+    async with aioredis.from_url(redis_address) as redis:
         storage = RedisStorage(redis)
         setup(app, storage)
         yield

docs/conf.py

@@ -343,7 +343,7 @@ texinfo_documents = [
 intersphinx_mapping = {
     "https://docs.python.org/3": None,
     "https://aiohttp.readthedocs.io/en/stable": None,
-    "https://aioredis.readthedocs.io/en/latest": None,
+    "https://redis.readthedocs.io/en/latest": None,
     # 'https://github.com/aio-libs/aiomcache': None,
     "http://cryptography.io/en/latest": None,
     "https://pynacl.readthedocs.io/en/latest": None,

docs/glossary.rst

@@ -10,9 +10,9 @@
 
    aioredis
 
-      :term:`asyncio` compatible Redis client library
+      :term:`asyncio` compatible module in the :term:`redis` library.
 
-      https://aioredis.readthedocs.io/
+      https://redis-py.readthedocs.io/en/stable/examples/asyncio_examples.html
 
    aiomcache
 

docs/index.rst

@@ -79,7 +79,7 @@ Available session storages are:
   ``e33b57c7ec6e425eb626610f811ab6ae`` (a random UUID) they key inside
   redis will be ``AIOHTTP_SESSION_e33b57c7ec6e425eb626610f811ab6ae``.
 
-  Requires :term:`aioredis` library:
+  Requires :term:`redis` library:
 
   .. code-block:: bash
 
@@ -121,7 +121,7 @@ Dependencies
 
 - :term:`cryptography` for
   :class:`~aiohttp_session.cookie_storage.EncryptedCookieStorage`
-- :term:`aioredis` for
+- :term:`redis` for
   :class:`~aiohttp_session.redis_storage.RedisStorage`
 
 

docs/reference.rst

@@ -378,11 +378,11 @@ Redis Storage
 The storage that stores session data in Redis database and
 keeps only Redis keys (UUIDs actually) in HTTP cookies.
 
-It operates with Redis database via :class:`aioredis.RedisPool`.
+It operates with Redis database via :class:`redis.asyncio.Redis`.
 
 To use the storage you need setup it first::
 
-   redis = await aioredis.create_pool(('localhost', 6379))
+   redis = await aioredis.from_url("redis://127.0.0.1:6379")
    storage = aiohttp_session.redis_storage.RedisStorage(redis)
    aiohttp_session.setup(app, storage)
 
@@ -398,10 +398,10 @@ To use the storage you need setup it first::
 
    The class is inherited from :class:`~aiohttp_session.AbstractStorage`.
 
-   *redis_pool* is a :class:`~aioredis.RedisPool` which should be
-   created by :func:`~aioredis.create_pool` call, e.g.::
+   *redis_pool* is a :class:`~redis.asyncio.Redis` which should be
+   created by :func:`~redis.asyncio.from_url` call, e.g.::
 
-      redis = await aioredis.create_pool(('localhost', 6379))
+      redis = await aioredis.from_url("redis://localhost:6379")
       storage = aiohttp_session.redis_storage.RedisStorage(redis)
 
    Other parameters are the same as for
@@ -409,7 +409,7 @@ To use the storage you need setup it first::
 
 
 Memcached Storage
-----------------
+-----------------
 
 The storage that stores session data in Memcached and
 keeps only keys (UUIDs actually) in HTTP cookies.

pytest.ini

 [pytest]
+asyncio_mode = auto
 filterwarnings=
     error
     # This is internal to the docker library.

requirements-dev.txt

 -e .
-aiohttp==3.8.1
+aiohttp==3.8.3
 aiomcache==0.7.0
-aioredis==2.0.0
-attrs==21.4.0
-chardet==4.0.0
-cryptography==36.0.1
-docker==5.0.3
-flake8==4.0.1
-flake8-bandit==2.1.2
-flake8-bugbear==22.1.11
+attrs==22.1.0
+chardet==5.0.0
+cryptography==38.0.1
+docker==6.0.0
+flake8==5.0.4
+flake8-bandit==4.1.1
+flake8-bugbear==22.10.27
 flake8-import-order==0.18.1
-flake8-requirements==1.5.2
+flake8-requirements==1.7.3
 multidict==6.0.2
-mypy==0.930
+mypy==0.982
 pep257==0.7.0
-pre-commit==2.17.0
+pre-commit==2.20.0
 pynacl==1.5.0
-pytest==6.2.5
-pytest-aiohttp==1.0.3
-pytest-cov==3.0.0
-pytest-mock==3.7.0
-pytest-sugar==0.9.4
+pytest==7.2.0
+pytest-aiohttp==1.0.4
+pytest-cov==4.0.0
+pytest-mock==3.10.0
+pytest-sugar==0.9.5
+redis==4.3.4
 sphinx==4.3.2
-typing-extensions==4.0.1
-yarl==1.7.2
+types-redis==4.3.21.3
+typing-extensions==4.4.0
+yarl==1.8.1