Upgrade pre-commit hooks

* Switch from reorder-python-imports to isort

* Update setup.cfg

* Autoformat with new version of black

Author: sigmavirus24

.pre-commit-config.yaml

@@ -1,37 +1,36 @@
 exclude: ^tests/fixtures/
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
-    hooks:
-    -   id: check-yaml
-    -   id: debug-statements
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
--   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
-    hooks:
-    -   id: reorder-python-imports
-        args: [--application-directories, '.:src', --py38-plus]
--   repo: https://github.com/psf/black
-    rev: 23.12.1
-    hooks:
-    -   id: black
--   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
-    hooks:
-    -   id: pyupgrade
-        args: [--py38-plus]
--   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
-    hooks:
-    -   id: mypy
-        exclude: ^(docs/|tests/)
--   repo: https://github.com/jorisroovers/gitlint
-    rev: v0.19.1
-    hooks:
-    - id: gitlint
--   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.5.0
-    hooks:
-    -   id: setup-cfg-fmt
-        args: [--min-py3-version, '3.8']
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+  - id: check-yaml
+  - id: debug-statements
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
+- repo: https://github.com/PyCQA/isort
+  rev: 6.0.1
+  hooks:
+  - id: isort
+- repo: https://github.com/psf/black
+  rev: 25.1.0
+  hooks:
+  - id: black
+- repo: https://github.com/asottile/pyupgrade
+  rev: v3.20.0
+  hooks:
+  - id: pyupgrade
+    args: [--py39-plus]
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.15.0
+  hooks:
+  - id: mypy
+    exclude: ^(docs/|tests/)
+- repo: https://github.com/jorisroovers/gitlint
+  rev: v0.19.1
+  hooks:
+  - id: gitlint
+- repo: https://github.com/asottile/setup-cfg-fmt
+  rev: v2.8.0
+  hooks:
+  - id: setup-cfg-fmt
+    args: [--min-py-version, '3.9']

pyproject.toml

@@ -1,7 +1,6 @@
 [tool.black]
 line-length = 78
-target-version = ['py38']
-safe = true
+target-version = ['py39']
 exclude = '''
 (
   /(
@@ -17,3 +16,8 @@ exclude = '''
   )/
 )
 '''
+
+[tool.isort]
+profile = "black"
+line_length = 78
+force_single_line = true

setup.cfg

@@ -12,9 +12,6 @@ license_files = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
     Intended Audience :: Developers
-    License :: OSI Approved
-    License :: OSI Approved :: Apache Software License
-    License :: OSI Approved :: BSD License
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
@@ -25,7 +22,7 @@ project_urls =
 
 [options]
 packages = find:
-python_requires = >=3.8
+python_requires = >=3.9
 include_package_data = True
 
 [options.package_data]

tests/test_uritemplate.py

@@ -1,9 +1,9 @@
-from unittest import main
 from unittest import TestCase
+from unittest import main
 
+from uritemplate import URITemplate
 from uritemplate import expand
 from uritemplate import partial
-from uritemplate import URITemplate
 from uritemplate import variable
 from uritemplate import variables
 

uritemplate/__init__.py

@@ -25,11 +25,9 @@
     int(i) for i in __version__.split(".") if i.isdigit()
 )
 
-from uritemplate.api import (
-    URITemplate,
-    expand,
-    partial,
-    variables,
-)
+from uritemplate.api import URITemplate
+from uritemplate.api import expand
+from uritemplate.api import partial
+from uritemplate.api import variables
 
 __all__ = ("URITemplate", "expand", "partial", "variables")

uritemplate/api.py

@@ -6,6 +6,7 @@
 This module contains the very simple API provided by uritemplate.
 
 """
+
 import typing as t
 
 from uritemplate import variable

uritemplate/template.py

@@ -14,6 +14,7 @@
 >
 
 """
+
 import re
 import typing as t
 
@@ -35,7 +36,6 @@ def _merge(
 
 
 class URITemplate:
-
     """This parses the template and will be used to expand it.
 
     This is the most important object as the center of the API.

uritemplate/variable.py

@@ -14,6 +14,7 @@
 >
 
 """
+
 import collections.abc
 import typing as t
 import urllib.parse
@@ -29,7 +30,6 @@
 
 
 class URIVariable:
-
     """This object validates everything inside the URITemplate object.
 
     It validates template expansions and will truncate length as decided by
@@ -59,9 +59,9 @@ def __init__(self, var: str):
         #: List of safe characters when quoting the string
         self.safe: str = ""
         #: List of variables in this variable
-        self.variables: t.List[
-            t.Tuple[str, t.MutableMapping[str, t.Any]]
-        ] = []
+        self.variables: t.List[t.Tuple[str, t.MutableMapping[str, t.Any]]] = (
+            []
+        )
         #: List of variable names
         self.variable_names: t.List[str] = []
         #: List of defaults passed in