cuid2 2.0.0__tar.gz → 2.0.1__tar.gz

{cuid2-2.0.0 → cuid2-2.0.1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: cuid2
-Version: 2.0.0
+Version: 2.0.1
 Summary: Next generation GUIDs. Collision-resistant ids optimized for horizontal scaling and performance.
-Keywords: crypt security uuid guid cuid cryptography
+Keywords: crypt,security,uuid,guid,cuid,cryptography
 Author-Email: Will Gordon <wgordon@redhat.com>
 License: The MIT License (MIT)
         

{cuid2-2.0.0 → cuid2-2.0.1}/pyproject.toml

@@ -31,7 +31,7 @@ keywords = [
     "cuid",
     "cryptography",
 ]
-version = "2.0.0"
+version = "2.0.1"
 
 [project.license]
 file = "LICENSE"
@@ -46,60 +46,61 @@ cuid2 = "cuid2.cli:main"
 source = "scm"
 
 [tool.pdm.scripts]
-black = "black {args:src/ local/tests/}"
-ruff = "ruff check --fix --exit-zero {args:src/ local/tests/}"
+ruff-check = "ruff check --fix --exit-zero {args:src/ local/tests/}"
+ruff-format = "ruff format {args:src/ local/tests/}"
 spelling = "codespell {args:src/ local/tests/}"
 pylint = "pylint {args:src/ local/tests/}"
-safety = "safety check --bare"
+safety = "safety {args:check --bare}"
 typing = "mypy {args:src/ local/tests/}"
+update-pip = "pip install --upgrade pip"
 testing = "pytest local/tests"
 testing-slow = "pytest local/tests --runslow"
 tox = "tox --parallel auto"
 
-[tool.pdm.scripts.lint-fast]
+[tool.pdm.scripts.ruff-fix]
 composite = [
-    "black",
-    "ruff",
+    "ruff-check",
+    "ruff-format",
 ]
 
 [tool.pdm.scripts.lint-full]
 composite = [
-    "lint-fast",
+    "ruff-fix",
     "spelling",
     "pylint",
     "typing",
     "safety",
 ]
 
+[tool.pdm.scripts.tox-full]
+composite = [
+    "update-pip",
+    "lint-full",
+]
+
 [tool.pdm.dev-dependencies]
 lint = [
-    "black~=23.3.0",
-    "codespell~=2.2.4",
-    "pylint~=2.17.4",
-    "ruff~=0.0.269",
-    "safety==2.4.0b1",
+    "codespell~=2.2.6",
+    "pylint~=3.1.0",
+    "requests>=2.31.0",
+    "ruff~=0.3.7",
+    "safety==3.1.0",
 ]
 test = [
-    "pytest~=7.3.1",
-    "pytest-mock~=3.10.0",
-    "pytest-sugar~=0.9.7",
+    "pytest~=8.1.1",
+    "pytest-mock~=3.14.0",
+    "pytest-sugar~=1.0.0",
 ]
 tox = [
-    "tox~=4.4.12",
-    "tox-pdm~=0.6.1",
+    "tox~=4.14.2",
+    "tox-pdm~=0.7.2",
 ]
 typing = [
-    "mypy~=1.3.0",
+    "mypy~=1.9.0",
 ]
 
 [tool.tox]
-legacy_tox_ini = "    [tox]\n    min_version = 4\n    env_list = py3{8,9,10,11}, check\n    work_dir = local/.tox\n    isolated_build = True\n\n    [testenv]\n    description = run unit tests\n    groups = test\n    commands = testing\n\n    [testenv:check]\n    description = run linters and typing\n    skip_install = true\n    groups = lint, typing, test\n    commands = lint-full\n"
-
-[tool.black]
-line-length = 120
-target_version = [
-    "py38",
-]
+legacy_tox_ini = "    [tox]\n    min_version = 4\n    env_list = py3{8,9,10,11,12}, check\n    work_dir = local/.tox\n    isolated_build = True\n\n    [testenv]\n    description = run unit tests\n    groups = test\n    commands = testing\n\n    [testenv:check]\n    description = run linters and typing\n    skip_install = true\n    groups = lint, typing, test\n    commands = tox-full\n"
 
 [tool.ruff]
 line-length = 120
@@ -108,12 +109,18 @@ src = [
 ]
 target-version = "py38"
 cache-dir = "local/.ruff_cache"
-extend-select = [
+force-exclude = true
+
+[tool.ruff.lint]
+select = [
+    "F",
+    "E",
     "W",
     "C90",
     "I",
     "N",
-    "UP",
+    "ASYNC",
+    "TRIO",
     "S",
     "BLE",
     "B",
@@ -123,6 +130,7 @@ extend-select = [
     "DTZ",
     "T10",
     "EM",
+    "FA",
     "ISC",
     "ICN",
     "G",
@@ -134,6 +142,7 @@ extend-select = [
     "RSE",
     "RET",
     "SLF",
+    "SLOT",
     "SIM",
     "INT",
     "ARG",
@@ -141,36 +150,35 @@ extend-select = [
     "PGH",
     "PL",
     "TRY",
+    "FLY",
+    "PERF",
+    "LOG",
     "RUF",
-    "D",
-    "ANN",
-    "PYI",
-    "TCH",
-    "ERA",
 ]
-extend-ignore = [
+ignore = [
     "D100",
     "D101",
     "D102",
     "D104",
     "D205",
     "D401",
+    "COM812",
+    "ISC001",
 ]
 unfixable = [
     "T201",
     "F401",
     "F841",
 ]
-force-exclude = true
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "test_*.py" = [
     "S101",
     "PLR2004",
     "SLF001",
 ]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = [
     "src",
 ]
@@ -182,11 +190,11 @@ section-order = [
     "local-folder",
 ]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
 [tool.pytest.ini_options]
-minversion = "7.3"
+minversion = "8.1"
 cache_dir = "local/.pytest_cache"
 python_files = "test_*.py"
 

{cuid2-2.0.0 → cuid2-2.0.1}/src/cuid2/__init__.py

@@ -1,4 +1,5 @@
 """Next generation GUIDs. Collision-resistant ids optimized for horizontal scaling and performance."""
+
 from .generator import DEFAULT_LENGTH, INITIAL_COUNT_MAX, Cuid, cuid_wrapper
 
 __all__ = ["Cuid", "DEFAULT_LENGTH", "INITIAL_COUNT_MAX", "cuid_wrapper"]

{cuid2-2.0.0 → cuid2-2.0.1}/src/cuid2/generator.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 from math import floor
 from secrets import SystemRandom
@@ -9,8 +11,7 @@ if TYPE_CHECKING:
     from _random import Random
 
     class FingerprintCallable(Protocol):  # pylint: disable=too-few-public-methods
-        def __call__(self: "FingerprintCallable", random_generator: Random) -> str:
-            ...
+        def __call__(self: FingerprintCallable, random_generator: Random) -> str: ...
 
 
 # ~22k hosts before 50% chance of initial counter collision
@@ -22,11 +23,11 @@ MAXIMUM_LENGTH: Final = 98
 
 class Cuid:  # pylint: disable=too-few-public-methods
     def __init__(
-        self: "Cuid",
-        random_generator: Callable[[], "Random"] = SystemRandom,
+        self: Cuid,
+        random_generator: Callable[[], Random] = SystemRandom,
         counter: Callable[[int], Callable[[], int]] = utils.create_counter,
         length: int = DEFAULT_LENGTH,
-        fingerprint: "FingerprintCallable" = utils.create_fingerprint,
+        fingerprint: FingerprintCallable = utils.create_fingerprint,
     ) -> None:
         """Initialization function for the Cuid class that generates a universally unique,
         base36 encoded string.
@@ -55,12 +56,12 @@ class Cuid:  # pylint: disable=too-few-public-methods
             msg = "Length must never exceed 98 characters."
             raise ValueError(msg)
 
-        self._random: "Random" = random_generator()
+        self._random: Random = random_generator()
         self._counter: Callable[[], int] = counter(floor(self._random.random() * INITIAL_COUNT_MAX))
         self._length: int = length
         self._fingerprint: str = fingerprint(random_generator=self._random)
 
-    def generate(self: "Cuid", length: Optional[int] = None) -> str:
+    def generate(self: Cuid, length: Optional[int] = None) -> str:
         """Generates a universally unique, base36 encoded string with a specified length.
 
         Parameters

{cuid2-2.0.0 → cuid2-2.0.1}/src/cuid2/utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import socket
 import string
@@ -46,7 +48,7 @@ def create_counter(count: int) -> Callable[[], int]:
     return counter
 
 
-def create_fingerprint(random_generator: "Random", fingerprint_data: Optional[str] = "") -> str:
+def create_fingerprint(random_generator: Random, fingerprint_data: Optional[str] = "") -> str:
     """Creates a fingerprint, by default combining process ID, hostname, and environment variables
     with entropy and then hashing the result.
 
@@ -76,7 +78,7 @@ def create_fingerprint(random_generator: "Random", fingerprint_data: Optional[st
     return create_hash(fingerprint)[0:BIG_LENGTH]
 
 
-def create_entropy(random_generator: "Random", length: int = 4) -> str:
+def create_entropy(random_generator: Random, length: int = 4) -> str:
     """Creates a random string of specified length using a base36 encoding.
 
     Parameters
@@ -126,14 +128,14 @@ def create_hash(data: str = "") -> str:
         Base36 encoding of the SHA-512 hash of the input string `data`, with the first character dropped.
 
     """
-    hashed_value: "_Hash" = sha512(data.encode())
+    hashed_value: _Hash = sha512(data.encode())
     hashed_int: int = int.from_bytes(hashed_value.digest(), byteorder="big")
 
     # Drop the first character because it will bias the histogram to the left.
     return base36_encode(hashed_int)[1:]
 
 
-def create_letter(random_generator: "Random") -> str:
+def create_letter(random_generator: Random) -> str:
     """Generates a random lowercase letter using a given random number generator.
 
     Parameters