change black and isort to ruff

Author: jgaul3

.pre-commit-config.yaml

@@ -1,21 +1,14 @@
 repos:
+-   repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.14.10
+    hooks:
+        # Run the linter.
+        - id: ruff
+          args: [ --fix ]
+        # Run the formatter.
+        - id: ruff-format
 -   repo: local
     hooks:
-    -   id: black
-        name: black
-        entry: poetry run black src stubs tests
-        language: system
-        require_serial: true
-        types: [python]
-        pass_filenames: false
-    -   id: isort
-        name: isort
-        entry: poetry run isort
-        language: system
-        types: [python]
-        require_serial: true
-        args: ['--filter-files']
-        files: "^(src/.*\\.py|tests/.*\\.py|stubs/.*\\.py)"
     -   id: mypy
         name: mypy
         entry: poetry run mypy

README.md

@@ -1,6 +1,6 @@
 # minisignxml
 
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Linter: Ruff](https://img.shields.io/badge/Linter-Ruff-blue)](https://github.com/astral-sh/ruff)
 [![CircleCI](https://circleci.com/gh/HENNGE/minisignxml.svg?style=svg)](https://circleci.com/gh/HENNGE/minisignxml)
 
 

examples/roundtrip.py

@@ -1,5 +1,4 @@
 import datetime
-from typing import Tuple
 
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
@@ -35,7 +34,7 @@ def roundtrip() -> None:
     print(serialize_xml(verified).decode("utf-8"))
 
 
-def make_key_and_cert() -> Tuple[RSAPrivateKey, Certificate]:
+def make_key_and_cert() -> tuple[RSAPrivateKey, Certificate]:
     """
     Create a private key/certificate pair. In real code you would usually
     generate these once and then securely store them somewhere.
@@ -50,8 +49,11 @@ def make_key_and_cert() -> Tuple[RSAPrivateKey, Certificate]:
         .issuer_name(x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, "test")]))
         .public_key(key.public_key())
         .serial_number(x509.random_serial_number())
-        .not_valid_before(datetime.datetime.utcnow())
-        .not_valid_after(datetime.datetime.utcnow() + datetime.timedelta(days=1))
+        .not_valid_before(datetime.datetime.now(tz=datetime.timezone.utc))
+        .not_valid_after(
+            datetime.datetime.now(tz=datetime.timezone.utc)
+            + datetime.timedelta(days=1)
+        )
         .sign(key, hashes.SHA256(), backend)
     )
     return key, cert

pyproject.toml

@@ -30,14 +30,33 @@ defusedxml = ">=0.7.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=5.2"
-black = "^23"
-isort = "^5"
 pytest-cov = ">=2.8.1"
 mypy = "^1"
 lxml-stubs = "^0.4.0"
+ruff = "^0.14.13"
 
-[tool.isort]
-profile = "black"
+[tool.ruff]
+line-length = 88
+exclude = [
+    "examples/",
+]
+
+[tool.ruff.lint]
+ignore = [
+    "E722", # Do not use bare `except`
+    "E501", # Line too long (104 > 88 characters)
+    "E731", # Do not assign a `lambda` expression, use a `def`
+    "UP046",
+    "UP047",
+]
+select = [
+    "DTZ",
+    "E",
+    "F",
+    "I",
+    "T201", # Don't commit print statements
+    "UP",
+]
 
 [tool.mypy]
 strict = true

src/minisignxml/config.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Collection
 from dataclasses import dataclass
-from typing import Collection, Type
 
 from cryptography.hazmat.primitives import hashes
 
@@ -18,8 +18,8 @@ def default(cls) -> SigningConfig:
 
 @dataclass(frozen=True)
 class VerifyConfig:
-    allowed_signature_method: Collection[Type[hashes.HashAlgorithm]]
-    allowed_digest_method: Collection[Type[hashes.HashAlgorithm]]
+    allowed_signature_method: Collection[type[hashes.HashAlgorithm]]
+    allowed_digest_method: Collection[type[hashes.HashAlgorithm]]
 
     @classmethod
     def default(cls) -> VerifyConfig:

src/minisignxml/errors.py

@@ -1,4 +1,4 @@
-from typing import Collection
+from collections.abc import Collection
 
 from cryptography.x509 import Certificate
 

src/minisignxml/internal/namespaces.py

@@ -1,6 +1,6 @@
 from lxml.builder import ElementMaker
 
-from .constants import *
+from .constants import XML_EXC_C14N, XMLDSIG
 
 
 def make_namespace(prefix: str, urn: str) -> ElementMaker:

src/minisignxml/internal/utils.py

@@ -1,5 +1,5 @@
 import base64
-from typing import List, Mapping
+from collections.abc import Mapping
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
@@ -17,7 +17,7 @@
     UnsupportedAlgorithm,
     UnsupportedHasher,
 )
-from .constants import *
+from .constants import XMLDSIG_RSA_SHA1, XMLDSIG_RSA_SHA256, XMLDSIG_SHA1, XMLENC_SHA256
 from .namespaces import NAMESPACE_MAP
 
 
@@ -83,7 +83,7 @@ def find_or_raise(
     return exactly_one(element.findall(path, ns_map), path, element)
 
 
-def exactly_one(elements: List[Element], path: str, parent: Element) -> Element:
+def exactly_one(elements: list[Element], path: str, parent: Element) -> Element:
     num_results = len(elements)
     if num_results < 1:
         raise ElementNotFound(path, parent)

src/minisignxml/sign.py

@@ -8,7 +8,7 @@
 from .config import SigningConfig
 from .errors import NoIDAttribute
 from .internal import utils
-from .internal.constants import *
+from .internal.constants import XML_EXC_C14N, XMLDSIG_ENVELOPED_SIGNATURE
 from .internal.namespaces import ds
 
 __all__ = ("sign",)

src/minisignxml/verify.py

@@ -1,5 +1,6 @@
+from collections.abc import Collection
 from hmac import compare_digest
-from typing import Collection, List, Tuple, cast
+from typing import cast
 
 from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.backends import default_backend
@@ -23,7 +24,7 @@ def extract_verified_element_and_certificate(
     certificates: Collection[Certificate],
     config: VerifyConfig = VerifyConfig.default(),
     attribute: str = "ID",
-) -> Tuple[Element, Certificate]:
+) -> tuple[Element, Certificate]:
     tree = utils.deserialize_xml(xml)
     signature = utils.find_or_raise(tree, ".//ds:Signature")
     signed_info = utils.find_or_raise(signature, "./ds:SignedInfo")
@@ -77,7 +78,7 @@ def extract_verified_element_and_certificate(
         raise UnsupportedAlgorithm(digest_method)
     referenced_element = utils.exactly_one(
         cast(
-            List[Element],
+            list[Element],
             XPath(f"descendant-or-self::*[@{attribute} = $reference_id]")(
                 tree, reference_id=reference_id
             ),