Switch to aioredis 2.0.0

icgood · Dec 5, 2021 · 68ce209 · 68ce209
1 parent e3d464c
commit 68ce209
Show file tree

Hide file tree

Showing 24 changed files with 491 additions and 296 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ['3.10']
 
     steps:
     - uses: actions/checkout@v2
@@ -50,7 +50,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.9'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.9'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel twine
@@ -35,7 +35,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.9'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,5 +1,4 @@
-# TODO: remove ".6" when 3.9.10 is released
-FROM python:3.9.6-alpine
+FROM python:3.10-alpine
 
 WORKDIR /pymap
 COPY . .

diff --git a/pymap/backend/dict/__init__.py b/pymap/backend/dict/__init__.py
@@ -42,7 +42,7 @@ def __init__(self, login: Login, config: Config) -> None:
         super().__init__()
         self._login = login
         self._config = config
-        self._status = HealthStatus(True)
+        self._status = HealthStatus()
 
     @property
     def login(self) -> Login:

diff --git a/pymap/backend/dict/mailbox.py b/pymap/backend/dict/mailbox.py
@@ -1,7 +1,6 @@
 
 from __future__ import annotations
 
-import hashlib
 from bisect import bisect_left
 from collections.abc import Iterable, Sequence, AsyncIterable
 from datetime import datetime
@@ -140,7 +139,7 @@ def __init__(self) -> None:
             WeakValueDictionary()
 
     def add(self, content: MessageContent) -> ObjectId:
-        msg_hash = HashStream(hashlib.sha1()).digest(content)
+        msg_hash = HashStream().digest(content)
         existing = self._email_ids.get(msg_hash)
         if existing is not None:
             return existing

diff --git a/pymap/backend/maildir/__init__.py b/pymap/backend/maildir/__init__.py
@@ -39,7 +39,7 @@ def __init__(self, login: Login, config: Config) -> None:
         super().__init__()
         self._login = login
         self._config = config
-        self._status = HealthStatus(True)
+        self._status = HealthStatus()
 
     @property
     def login(self) -> Login: