Merge d816678975 into e875008bff

See here for indept explanation: https://github.com/psf/black/issues/4175
See here (and related) for the attitude: https://github.com/asottile/reorder-python-imports/issues/366

.github/scripts/setup-env.sh

@@ -26,7 +26,6 @@ poetry --version --no-ansi;
 poetry run pip --version;
 
 poetry install \
-  --extras poetry \
   --quiet \
   --remove-untracked \
   --no-ansi;

.github/workflows/ci.yaml

@@ -12,8 +12,6 @@ jobs:
     strategy:
       matrix:
         python:
-          - version: "3.7"
-            toxenv: py37
           - version: "3.8"
             toxenv: py38
           - version: "3.9"
@@ -22,6 +20,8 @@ jobs:
             toxenv: py310
           - version: "3.11"
             toxenv: py311
+          - version: "3.12"
+            toxenv: py312
       fail-fast: true
     steps:
       - name: Checkout

.pre-commit-config.yaml

@@ -47,12 +47,13 @@ repos:
 
       - id: reorder-python-imports
         name: reorder-python-imports
-        entry: reorder-python-imports
+        entry: isort
         language: system
-        args:
-          - "--unclassifiable-application-module=tox_poetry_installer"
+        require_serial: true
         types:
           - python
+        args:
+          - "--filter-files"
 
       - id: black
         name: black

pyproject.toml

@@ -23,45 +23,46 @@ classifiers = [
   "Natural Language :: English",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: Implementation :: CPython",
 ]
 
 [tool.poetry.plugins.tox]
 poetry_installer = "tox_poetry_installer"
 
-[tool.poetry.extras]
-poetry = ["poetry", "cleo"]
-
 [tool.poetry.dependencies]
-python = "^3.7"
-cleo = {version = ">=1.0,<3.0", optional = true}
-poetry = {version = "^1.5.0", optional = true}
+python = "^3.8"
+cleo = ">=1.0,<3.0"
+poetry = "^1.5.0"
 poetry-core = "^1.1.0"
-tox = "^4"
+tox = "^4.1"
 
 [tool.poetry.group.dev.dependencies]
-bandit = "^1.6.2"
-black = "^22.3.0"
-blacken-docs = "^1.8.0"
-ipython = {version = "^8.10.1", python = "^3.8"}
-mdformat = "^0.7"
-mdformat-gfm = "^0.3"
-mypy = "^0.930"
-pre-commit = "^2.7.1"
-pre-commit-hooks = "^3.3.0"
-pylint = "^2.13.0"
-pytest = "^6.0.2"
-pytest-cov = "^2.10.1"
-reorder-python-imports = "^2.3.5"
-safety = "^2.2.0"
-toml = "^0.10.1"
-tox = "^4"
-types-toml = "^0.10.1"
+bandit = {version = "^1.7.7", python = "^3.10"}
+black = {version = "^24.3.0", python = "^3.10"}
+blacken-docs = {version = "^1.18.0", python = "^3.10"}
+ipython = {version = "^8.10.1", python = "^3.10"}
+isort = {version = "^5.13.2", python = "^3.10"}
+mdformat = {version = "^0.7", python = "^3.10"}
+mdformat-gfm = {version = "^0.3", python = "^3.10"}
+mypy = {version = "^0.930", python = "^3.10"}
+pre-commit = {version = "^3.8.0", python = "^3.10"}
+pre-commit-hooks = {version = "^4.6.0", python = "^3.10"}
+pylint = {version = "^3.2.6", python = "^3.10"}
+pytest = {version = "^8.3.2", python = "^3.10"}
+pytest-cov = {version = "^5.0.0", python = "^3.10"}
+toml = {version = "^0.10.1", python = "^3.10"}
+tox = "^4.1"
+types-toml = {version = "^0.10.1", python = "^3.10"}
+
+[tool.isort]
+profile = "black"
+force_single_line = "true"
+lines_after_imports = 2
 
 [build-system]
 requires = ["poetry-core>=1.1.0"]

tests/fixtures.py

@@ -1,4 +1,4 @@
-# pylint: disable=missing-module-docstring, missing-function-docstring, unused-argument, too-few-public-methods
+# pylint: disable=missing-module-docstring,missing-function-docstring,unused-argument,too-few-public-methods,protected-access
 import time
 from pathlib import Path
 from typing import List

tests/test_installer.py

@@ -1,4 +1,4 @@
-# pylint: disable=missing-module-docstring, redefined-outer-name, unused-argument, wrong-import-order, unused-import
+# pylint: disable=missing-module-docstring,redefined-outer-name,unused-argument,unused-import,protected-access
 import time
 from unittest import mock
 
@@ -7,6 +7,7 @@ import tox.tox_env.python.virtual_env.runner
 from poetry.factory import Factory
 
 import tox_poetry_installer.hooks._tox_on_install_helpers
+
 from .fixtures import mock_poetry_factory
 from .fixtures import mock_venv
 

tests/test_metadata.py

@@ -3,6 +3,7 @@
 The next best thing to having one source of truth is having a way to ensure all of your
 sources of truth agree with each other.
 """
+
 from pathlib import Path
 
 import toml

tests/test_transients.py

@@ -1,14 +1,13 @@
-# pylint: disable=missing-module-docstring, redefined-outer-name, unused-argument, wrong-import-order, unused-import
+# pylint: disable=missing-module-docstring,redefined-outer-name,unused-argument,unused-import,protected-access
 import poetry.factory
 import poetry.utils.env
 import pytest
-from poetry.puzzle.provider import Provider
 
 import tox_poetry_installer.hooks._tox_on_install_helpers
+from tox_poetry_installer import exceptions
+
 from .fixtures import mock_poetry_factory
 from .fixtures import mock_venv
-from tox_poetry_installer import constants
-from tox_poetry_installer import exceptions
 
 
 def test_allow_missing():

tox.ini

@@ -1,13 +1,11 @@
 [tox]
-envlist = py37, py38, py39, py310, py311, static, static-tests, security
+envlist = py3{8,9,10,11,12} static, static-tests, security
 skip_missing_interpreters = true
 
 [testenv]
 description = Run the tests
 require_locked_deps = true
 require_poetry = true
-extras =
-    poetry
 locked_deps =
     pytest
     pytest-cov
@@ -26,10 +24,10 @@ ignore_errors = true
 locked_deps =
     black
     blacken-docs
+    isort
     mdformat
     mdformat-gfm
     mypy
-    reorder-python-imports
     pre-commit
     pre-commit-hooks
     pylint
@@ -52,6 +50,7 @@ locked_deps =
     pylint
     pytest
     mypy
+    toml
     types-toml
 commands =
     pylint {toxinidir}/tests/ \
@@ -78,14 +77,3 @@ commands =
       --recursive \
       --quiet \
       --skip B101
-    poetry export \
-      --format requirements.txt \
-      --output {envtmpdir}/requirements.txt \
-      --without-hashes \
-      --with dev \
-      --extras poetry
-    safety check \
-      --file {envtmpdir}/requirements.txt \
-      --output text \
-      # https://github.com/pytest-dev/py/issues/287
-      --ignore 51457

tox_poetry_installer/_poetry.py

@@ -21,13 +21,14 @@ at the module scope it is imported into function scope wherever Poetry component
 moves import errors from load time to runtime which allows the plugin to be skipped if Poetry isn't
 installed and/or a more helpful error be raised within the Tox framework.
 """
-# pylint: disable=unused-import
+
 import sys
 
 from tox_poetry_installer import exceptions
 
 
 try:
+    # pylint: disable=import-outside-toplevel,unused-import
     from cleo.io.null_io import NullIO
     from poetry.config.config import Config
     from poetry.core.packages.dependency import Dependency as PoetryDependency

tox_poetry_installer/constants.py

@@ -5,7 +5,7 @@ in this module.
 
 All constants should be type hinted.
 """
-from typing import Set
+
 from typing import Tuple
 
 from tox_poetry_installer import __about__

tox_poetry_installer/exceptions.py

@@ -11,6 +11,7 @@ All exceptions should inherit from the common base exception :exc:`ToxPoetryInst
    +-- LockedDepNotFoundError
    +-- ExtraNotFoundError
    +-- LockedDepsRequiredError
+   +-- LockfileParsingError
 
 """
 
@@ -41,3 +42,7 @@ class ExtraNotFoundError(ToxPoetryInstallerException):
 
 class LockedDepsRequiredError(ToxPoetryInstallerException):
     """Environment cannot specify unlocked dependencies when locked dependencies are required"""
+
+
+class LockfileParsingError(ToxPoetryInstallerException):
+    """Failed to load or parse the Poetry lockfile"""

tox_poetry_installer/hooks/_tox_on_install_helpers.py

@@ -1,4 +1,5 @@
 """Helper functions for the :func:`tox_on_install` hook"""
+
 import collections
 import concurrent.futures
 import contextlib
@@ -20,9 +21,14 @@ from tox_poetry_installer import constants
 from tox_poetry_installer import exceptions
 from tox_poetry_installer import logger
 
+
 if typing.TYPE_CHECKING:
     from tox_poetry_installer import _poetry
 
+# This is globally disabled to support the usage of the _poetry shadow module
+# pylint: disable=import-outside-toplevel
+
+
 PackageMap = Dict[str, List[PoetryPackage]]
 
 

tox_poetry_installer/hooks/tox_add_env_config.py

@@ -1,12 +1,16 @@
 """Add required env configuration options to the tox INI file"""
+
 from typing import List
 
 from tox.config.sets import EnvConfigSet
 from tox.plugin import impl
 
 
+# pylint: disable=missing-function-docstring
 @impl
-def tox_add_env_config(env_conf: EnvConfigSet):
+def tox_add_env_config(
+    env_conf: EnvConfigSet,
+):
     env_conf.add_config(
         "poetry_dep_groups",
         of_type=List[str],

tox_poetry_installer/hooks/tox_add_option.py

@@ -1,10 +1,12 @@
 """Add additional command line arguments to tox to configure plugin behavior"""
+
 from tox.config.cli.parser import ToxParser
 from tox.plugin import impl
 
 from tox_poetry_installer import constants
 
 
+# pylint: disable=missing-function-docstring
 @impl
 def tox_add_option(parser: ToxParser):
     parser.add_argument(

tox_poetry_installer/hooks/tox_on_install.py

@@ -4,6 +4,7 @@ Loads the local Poetry environment and the corresponding lockfile then pulls the
 specified by the Tox environment. Finally these dependencies are installed into the Tox
 environment using the Poetry ``PipInstaller`` backend.
 """
+
 from itertools import chain
 
 from tox.plugin import impl
@@ -21,10 +22,9 @@ from tox_poetry_installer.hooks._tox_on_install_helpers import find_project_deps
 from tox_poetry_installer.hooks._tox_on_install_helpers import install_package
 
 
+# pylint: disable=missing-function-docstring,unused-argument
 @impl
-def tox_on_install(
-    tox_env: ToxVirtualEnv, section: str  # pylint: disable=unused-argument
-) -> None:
+def tox_on_install(tox_env: ToxVirtualEnv, *args) -> None:
     try:
         poetry = check_preconditions(tox_env)
     except exceptions.SkipEnvironment as err:
@@ -41,10 +41,16 @@ def tox_on_install(
 
     virtualenv = convert_virtualenv(tox_env)
 
+    try:
         if not poetry.locker.is_fresh():
             logger.warning(
                 f"The Poetry lock file is not up to date with the latest changes in {poetry.file}"
             )
+    except FileNotFoundError as err:
+        logger.error(f"Could not parse lockfile: {err}")
+        raise exceptions.LockfileParsingError(
+            f"Could not parse lockfile: {err}"
+        ) from err
 
     try:
         if tox_env.conf["require_locked_deps"] and tox_env.conf["deps"].lines():

tox_poetry_installer/logger.py

@@ -4,6 +4,7 @@ Calling ``tox.reporter.something()`` and having to format a string with the pref
 gets really old fast, but more importantly it also makes the flow of the main code
 more difficult to follow because of the added complexity.
 """
+
 import logging
 
 from tox_poetry_installer import constants