Ignore failure of tox executable and drop 3.7 (#121)

Co-authored-by: Taher Chegini <[email protected]>
Co-authored-by: Taher Chegini <[email protected]>

Author: 3 people

.github/workflows/check.yml

@@ -18,12 +18,11 @@ jobs:
       fail-fast: false
       matrix:
         py:
-          - "3.12.0-beta.2"
+          - "3.12.0-rc.1"
           - "3.11"
           - "3.10"
           - "3.9"
           - "3.8"
-          - "3.7"
     steps:
       - name: setup python for tox
         uses: actions/setup-python@v4

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
     rev: "0.13.1"
     hooks:
       - id: pyproject-fmt
-        additional_dependencies: ["tox>=4.6.4"]
+        additional_dependencies: ["tox>=4.8"]
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: "v3.0.2"
     hooks:

.readthedocs.yml

@@ -2,7 +2,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3"
+    python: "3.11"
 python:
   install:
     - method: pip

README.md

@@ -14,7 +14,7 @@ Apply a consistent format to `pyproject.toml` files.
 
 ```yaml
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "0.11.1"
+  rev: "1.0.0"
   hooks:
     - id: pyproject-fmt
 ```

docs/index.rst

@@ -25,7 +25,7 @@ See :gh:`pre-commit/pre-commit` for instructions, sample ``.pre-commit-config.ya
 .. code-block:: yaml
 
     - repo: https://github.com/tox-dev/pyproject-fmt
-      rev: "0.9.0"
+      rev: "1.0.0"
       hooks:
         - id: pyproject-fmt
 

pyproject.toml

@@ -2,7 +2,7 @@
 build-backend = "hatchling.build"
 requires = [
   "hatch-vcs>=0.3",
-  "hatchling>=1.17.1",
+  "hatchling>=1.18",
 ]
 
 [project]
@@ -15,13 +15,12 @@ keywords = [
 ]
 license.file = "LICENSE.txt"
 authors = [{ name = "Bernat Gabor", email = "[email protected]" }]
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = [
   "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
@@ -34,14 +33,13 @@ dynamic = [
 dependencies = [
   "natsort>=8.4",
   "packaging>=23.1",
-  "tomlkit>=0.11.8",
-  'typing-extensions>=4.7.1; python_version < "3.8"',
+  "tomlkit>=0.12.1",
 ]
 optional-dependencies.docs = [
-  "furo>=2023.5.20",
-  "sphinx>=7.0.1",
+  "furo>=2023.7.26",
+  "sphinx>=7.1.2",
   "sphinx-argparse-cli>=1.11.1",
-  "sphinx-autodoc-typehints!=1.23.4,>=1.23.3",
+  "sphinx-autodoc-typehints>=1.24",
   "sphinx-copybutton>=0.5.2",
 ]
 optional-dependencies.test = [
@@ -65,7 +63,7 @@ version.source = "vcs"
 [tool.ruff]
 select = ["ALL"]
 line-length = 120
-target-version = "py37"
+target-version = "py38"
 isort = {known-first-party = ["pyproject_fmt"], required-imports = ["from __future__ import annotations"]}
 ignore = [
   "ANN101",  # no typoe annotation for self

src/pyproject_fmt/cli.py

@@ -82,7 +82,9 @@ def cli_args(args: Sequence[str]) -> PyProjectFmtNamespace:
     :return: the parsed options
     """
     parser = _build_cli()
-    return parser.parse_args(namespace=PyProjectFmtNamespace(), args=args)
+    result = PyProjectFmtNamespace()
+    parser.parse_args(namespace=result, args=args)
+    return result
 
 
 __all__ = [

src/pyproject_fmt/formatter/config.py

@@ -5,13 +5,8 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    import sys
     from pathlib import Path
-
-    if sys.version_info >= (3, 8):  # pragma: no cover (py38+)
-        from typing import Final
-    else:  # pragma: no cover (<py38)
-        from typing_extensions import Final
+    from typing import Final
 
 
 DEFAULT_INDENT: Final[int] = 2  #: default indentation level

src/pyproject_fmt/formatter/project.py

@@ -2,8 +2,8 @@
 from __future__ import annotations
 
 import re
-import subprocess
 from shutil import which
+from subprocess import CalledProcessError, check_output
 from typing import TYPE_CHECKING, Optional, cast
 
 from packaging.utils import canonicalize_name
@@ -25,11 +25,14 @@ def _get_max_version() -> int:
     max_version = _PY_MAX_VERSION
     tox = which("tox")
     if tox is not None:  # pragma: no branch
-        tox_environments = subprocess.check_output(
-            ["tox", "-aqq"],  # noqa: S603, S607
-            encoding="utf-8",
-            text=True,
-        )
+        try:
+            tox_environments = check_output(
+                [tox, "-aqq"],  # noqa: S603
+                encoding="utf-8",
+                text=True,
+            )
+        except (OSError, CalledProcessError):
+            return max_version
         if not re.match(r"ROOT: No .* found, assuming empty", tox_environments):
             found = set()
             for env in tox_environments.split():

src/pyproject_fmt/formatter/util.py

@@ -1,10 +1,9 @@
 """Utility methods."""
 from __future__ import annotations
 
-import sys
 from collections import defaultdict
 from dataclasses import dataclass, field
-from typing import Any, Callable, Iterable, Sequence, TypeVar
+from typing import Any, Callable, Iterable, Protocol, Sequence, TypeVar
 
 from natsort import natsorted
 from tomlkit.container import OutOfOrderTableProxy
@@ -22,11 +21,6 @@
     _ArrayItemGroup,
 )
 
-if sys.version_info >= (3, 8):  # pragma: no cover (py38+)
-    from typing import Protocol
-else:  # pragma: no cover (<py38)
-    from typing_extensions import Protocol
-
 
 class SupportsDunderLT(Protocol):
     def __lt__(self, __other: Any) -> bool: