Merge branch 'main' into ISC

Author: agronholm

pyproject.toml

@@ -91,17 +91,16 @@ omit = ["*/vendored/*"]
 [tool.coverage.report]
 show_missing = true
 
-[tool.ruff]
-line-length = 88
-src = ["src"]
-
 [tool.ruff.lint]
-select = [
-    "E", "F", "W",  # default flake-8
+extend-select = [
+    "B",            # flake8-bugbear
+    "G",            # flake8-logging-format
     "I",            # isort
+    "ISC",          # flake8-implicit-str-concat
     "PGH",          # pygrep-hooks
+    "RUF100",       # unused noqa (yesqa)
     "UP",           # pyupgrade
-    "B",            # flake8-bugbear
+    "W",            # pycodestyle warnings
 ]
 
 # Tox (https://tox.wiki/) is a tool for running tests in multiple virtualenvs.

tests/cli/test_pack.py

@@ -7,7 +7,6 @@
 from zipfile import ZipFile
 
 import pytest
-
 from wheel.cli.pack import pack
 
 THISDIR = os.path.dirname(__file__)

tests/cli/test_tags.py

@@ -6,7 +6,6 @@
 from zipfile import ZipFile
 
 import pytest
-
 from wheel.cli import main, parser
 from wheel.cli.tags import tags
 from wheel.wheelfile import WheelFile

tests/cli/test_unpack.py

@@ -4,7 +4,6 @@
 import stat
 
 import pytest
-
 from wheel.cli.unpack import unpack
 from wheel.wheelfile import WheelFile
 

tests/test_bdist_wheel.py

@@ -16,7 +16,6 @@
 
 import pytest
 import setuptools
-
 from wheel.bdist_wheel import (
     bdist_wheel,
     get_abi_tag,

tests/test_macosx_libfile.py

@@ -5,7 +5,6 @@
 import sysconfig
 
 import pytest
-
 from wheel.bdist_wheel import get_platform
 from wheel.macosx_libfile import extract_macosx_min_system_version
 

tests/test_wheelfile.py

@@ -5,7 +5,6 @@
 from zipfile import ZIP_DEFLATED, ZipFile
 
 import pytest
-
 from wheel.cli import WheelError
 from wheel.wheelfile import WheelFile