Drop Python 3.6

.github/workflows/main.yml → .github/workflows/ci.yml

@@ -20,7 +20,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
     rev: v2.37.3
     hooks:
       - id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
 
   - repo: https://github.com/asottile/yesqa
     rev: v1.4.0

CHANGELOG.md

@@ -26,6 +26,11 @@ What explicitly *may* change over time are the default hashing parameters and th
 
 ## [Unreleased](https://github.com/hynek/argon2-cffi/compare/21.3.0...HEAD)
 
+### Removed
+
+- Python 3.6 is not supported anymore.
+
+
 ### Added
 
 - Official support for Python 3.11.

README.rst

@@ -52,7 +52,7 @@ Project Information
 - **Source Code**: https://github.com/hynek/argon2-cffi
 - **Documentation**: https://argon2-cffi.readthedocs.io/
 - **Changelog**: https://github.com/hynek/argon2-cffi/blob/main/CHANGELOG.md
-- **Supported Python Versions**: 3.6 and later
+- **Supported Python Versions**: 3.7 and later
 
 The low-level Argon2 CFFI bindings are maintained in the separate project `argon2-cffi-bindings <https://github.com/hynek/argon2-cffi-bindings>`_.
 

pyproject.toml

@@ -7,9 +7,10 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "argon2-cffi"
+description = "Argon2 for Python"
 authors = [{ name = "Hynek Schlawack", email = "hs@ox.cx" }]
-dynamic = ["version", "description"]
-requires-python = ">=3.6"
+dynamic = ["version"]
+requires-python = ">=3.7"
 license = { file = "LICENSE" }
 readme = "README.rst"
 keywords = ["password", "hash", "hashing", "security"]
@@ -23,7 +24,6 @@ classifiers = [
     "Operating System :: POSIX",
     "Operating System :: Unix",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
@@ -38,7 +38,6 @@ classifiers = [
 ]
 dependencies = [
     "argon2-cffi-bindings",
-    "dataclasses; python_version < '3.7'",
     "typing-extensions; python_version < '3.8'", # c.f. _typing.py module
 ]
 

src/argon2/__init__.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 
 """
-The secure Argon2 password hashing algorithm.
+Argon2 for Python
 """
 
 from . import exceptions, low_level, profiles

src/argon2/__main__.py

@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: MIT
 
+from __future__ import annotations
+
 import argparse
 import sys
 import timeit
 
-from typing import List
-
 from . import (
     DEFAULT_HASH_LENGTH,
     DEFAULT_MEMORY_COST,
@@ -16,7 +16,7 @@
 )
 
 
-def main(argv: List[str]) -> None:
+def main(argv: list[str]) -> None:
     parser = argparse.ArgumentParser(description="Benchmark Argon2.")
     parser.add_argument(
         "-n", type=int, default=100, help="Number of iterations to measure."

src/argon2/_legacy.py

@@ -4,9 +4,9 @@
 Legacy mid-level functions.
 """
 
-import os
+from __future__ import annotations
 
-from typing import Optional
+import os
 
 from ._password_hasher import (
     DEFAULT_HASH_LENGTH,
@@ -21,7 +21,7 @@
 
 def hash_password(
     password: bytes,
-    salt: Optional[bytes] = None,
+    salt: bytes | None = None,
     time_cost: int = DEFAULT_TIME_COST,
     memory_cost: int = DEFAULT_MEMORY_COST,
     parallelism: int = DEFAULT_PARALLELISM,
@@ -43,7 +43,7 @@ def hash_password(
 
 def hash_password_raw(
     password: bytes,
-    salt: Optional[bytes] = None,
+    salt: bytes | None = None,
     time_cost: int = DEFAULT_TIME_COST,
     memory_cost: int = DEFAULT_MEMORY_COST,
     parallelism: int = DEFAULT_PARALLELISM,

src/argon2/_password_hasher.py

@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: MIT
 
-import os
+from __future__ import annotations
 
-from typing import Union
+import os
 
 from ._typing import Literal
 from ._utils import Parameters, _check_types, extract_parameters
@@ -18,7 +18,7 @@
 DEFAULT_PARALLELISM = RFC_9106_LOW_MEMORY.parallelism
 
 
-def _ensure_bytes(s: Union[bytes, str], encoding: str) -> bytes:
+def _ensure_bytes(s: bytes | str, encoding: str) -> bytes:
     """
     Ensure *s* is a bytes string.  Encode using *encoding* if it isn't.
     """
@@ -108,7 +108,7 @@ def __init__(
         self.encoding = encoding
 
     @classmethod
-    def from_parameters(cls, params: Parameters) -> "PasswordHasher":
+    def from_parameters(cls, params: Parameters) -> PasswordHasher:
         """
         Construct a `PasswordHasher` from *params*.
 
@@ -143,7 +143,7 @@ def salt_len(self) -> int:
     def type(self) -> Type:
         return self._parameters.type
 
-    def hash(self, password: Union[str, bytes]) -> str:
+    def hash(self, password: str | bytes) -> str:
         """
         Hash *password* and return an encoded hash.
 
@@ -171,7 +171,7 @@ def hash(self, password: Union[str, bytes]) -> str:
     }
 
     def verify(
-        self, hash: Union[str, bytes], password: Union[str, bytes]
+        self, hash: str | bytes, password: str | bytes
     ) -> Literal[True]:
         """
         Verify that *password* matches *hash*.

src/argon2/_typing.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: MIT
 
+from __future__ import annotations
+
 import sys
 
 

src/argon2/_utils.py

@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: MIT
 
+from __future__ import annotations
+
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 from .exceptions import InvalidHash
 from .low_level import Type
@@ -10,7 +12,7 @@
 NoneType = type(None)
 
 
-def _check_types(**kw: Any) -> Optional[str]:
+def _check_types(**kw: Any) -> str | None:
     """
     Check each ``name: (value, types)`` in *kw*.
 

src/argon2/exceptions.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: MIT
 
+from __future__ import annotations
+
 
 class Argon2Error(Exception):
     """

src/argon2/low_level.py

@@ -5,10 +5,12 @@
 
 .. warning::
     This is a "Hazardous Materials" module.  You should **ONLY** use it if
-    you're 100% absolutely sure that you know what you’re doing because this
+    you're 100% absolutely sure that you know what you're doing because this
     module is full of land mines, dragons, and dinosaurs with laser guns.
 """
 
+from __future__ import annotations
+
 from enum import Enum
 from typing import Any
 

src/argon2/profiles.py

@@ -9,6 +9,8 @@
 .. versionadded:: 21.2.0
 """
 
+from __future__ import annotations
+
 from ._utils import Parameters
 from .low_level import Type
 

tox.ini

@@ -14,7 +14,6 @@ ignore =
 # We don't run pre-commit in CI, because we use pre-commit.ci.
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38, docs
     3.9: py39, mypy
@@ -24,7 +23,7 @@ python =
 
 
 [tox]
-envlist = pre-commit,mypy,py36,py37,py38,py39,py310,py311,pypy3,system-argon2,bindings-main,docs,pypi-description,coverage-report
+envlist = pre-commit,mypy,py37,py38,py39,py310,py311,pypy3,system-argon2,bindings-main,docs,pypi-description,coverage-report
 isolated_build = true