.github/workflows/main.yml

@@ -18,7 +18,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - 3.7
         - 3.8
         - 3.9
         - '3.10'

.pre-commit-config.yaml

@@ -14,19 +14,19 @@ repos:
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: 0.11.2
+  rev: 0.12.1
   hooks:
   - id: pyproject-fmt
 - repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v2.3.0
+  rev: v2.4.0
   hooks:
   - id: setup-cfg-fmt
     args:
     - --include-version-classifiers
     - --max-py-version
     - '3.12'
 - repo: https://github.com/tox-dev/tox-ini-fmt
-  rev: 1.3.0
+  rev: 1.3.1
   hooks:
   - id: tox-ini-fmt
 - repo: https://github.com/rstcheck/rstcheck
@@ -36,26 +36,26 @@ repos:
     additional_dependencies:
     - tomli==2.0.1
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.6.0
+  rev: v3.8.0
   hooks:
   - id: pyupgrade
-    args: [--py37-plus]
+    args: [--py38-plus]
 - repo: https://github.com/psf/black
   rev: 23.3.0
   hooks:
   - id: black
 - repo: https://github.com/adamchainz/blacken-docs
-  rev: 1.13.0
+  rev: 1.14.0
   hooks:
   - id: blacken-docs
     additional_dependencies:
     - black==23.1.0
 - repo: https://github.com/asottile/reorder-python-imports
-  rev: v3.9.0
+  rev: v3.10.0
   hooks:
   - id: reorder-python-imports
     args:
-    - --py37-plus
+    - --py38-plus
     - --application-directories
     - .:example:src
     - --add-import
@@ -70,6 +70,6 @@ repos:
     - flake8-tidy-imports
     - flake8-typing-imports
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.3.0
+  rev: v1.4.1
   hooks:
   - id: mypy

CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog
 =========
 
+3.14.0 (2023-07-10)
+-------------------
+
+* Drop Python 3.7 support.
+
 3.13.0 (2023-06-15)
 -------------------
 

MANIFEST.in

@@ -1,3 +1,4 @@
+prune tests
 include CHANGELOG.rst
 include LICENSE
 include pyproject.toml

README.rst

@@ -20,7 +20,7 @@ A `flake8 <https://flake8.readthedocs.io/en/latest/index.html>`_ plugin that hel
 Requirements
 ============
 
-Python 3.7 to 3.12 supported.
+Python 3.8 to 3.12 supported.
 
 Installation
 ============

pyproject.toml

@@ -5,7 +5,7 @@ requires = [
 ]
 
 [tool.black]
-target-version = ['py37']
+target-version = ['py38']
 
 [tool.pytest.ini_options]
 addopts = """\

requirements/compile.py

@@ -17,11 +17,6 @@
         "--generate-hashes",
         "--allow-unsafe",
     ] + sys.argv[1:]
-    subprocess.run(
-        ["python3.7", *common_args, "-o", "py37.txt"],
-        check=True,
-        capture_output=True,
-    )
     subprocess.run(
         ["python3.8", *common_args, "-o", "py38.txt"],
         check=True,

requirements/py310.txt

@@ -36,16 +36,16 @@ pyflakes==3.0.1 \
     --hash=sha256:ec55bf7fe21fff7f1ad2f7da62363d749e2a470500eab1b555334b67aa1ef8cf \
     --hash=sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd
     # via flake8
-pytest==7.3.1 \
-    --hash=sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362 \
-    --hash=sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3
+pytest==7.3.2 \
+    --hash=sha256:cdcbd012c9312258922f8cd3f1b62a6580fdced17db6014896053d47cddf9295 \
+    --hash=sha256:ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b
     # via
     #   -r requirements.in
     #   pytest-flake8-path
     #   pytest-randomly
-pytest-flake8-path==1.3.0 \
-    --hash=sha256:a1f6a7f045e73b3400a59ad1a874dad39636a8d6bedef6e962396f863e05a4ac \
-    --hash=sha256:a3ddf053b56dbd1981f0e74ca02041e18f4e9f82435052358ffd2c147bf5a461
+pytest-flake8-path==1.4.0 \
+    --hash=sha256:b1c21f599158c90b68a16d301d1ffa19d25c297ef22f0ca4560160065a852e8b \
+    --hash=sha256:c873d169e4ea5ab889413212bc33eb13d653c0e7f6c630fce6dc982076a228b7
     # via -r requirements.in
 pytest-randomly==3.12.0 \
     --hash=sha256:d60c2db71ac319aee0fc6c4110a7597d611a8b94a5590918bfa8583f00caccb2 \

requirements/py311.txt

@@ -32,16 +32,16 @@ pyflakes==3.0.1 \
     --hash=sha256:ec55bf7fe21fff7f1ad2f7da62363d749e2a470500eab1b555334b67aa1ef8cf \
     --hash=sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd
     # via flake8
-pytest==7.3.1 \
-    --hash=sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362 \
-    --hash=sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3
+pytest==7.3.2 \
+    --hash=sha256:cdcbd012c9312258922f8cd3f1b62a6580fdced17db6014896053d47cddf9295 \
+    --hash=sha256:ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b
     # via
     #   -r requirements.in
     #   pytest-flake8-path
     #   pytest-randomly
-pytest-flake8-path==1.3.0 \
-    --hash=sha256:a1f6a7f045e73b3400a59ad1a874dad39636a8d6bedef6e962396f863e05a4ac \
-    --hash=sha256:a3ddf053b56dbd1981f0e74ca02041e18f4e9f82435052358ffd2c147bf5a461
+pytest-flake8-path==1.4.0 \
+    --hash=sha256:b1c21f599158c90b68a16d301d1ffa19d25c297ef22f0ca4560160065a852e8b \
+    --hash=sha256:c873d169e4ea5ab889413212bc33eb13d653c0e7f6c630fce6dc982076a228b7
     # via -r requirements.in
 pytest-randomly==3.12.0 \
     --hash=sha256:d60c2db71ac319aee0fc6c4110a7597d611a8b94a5590918bfa8583f00caccb2 \

requirements/py312.txt

@@ -39,9 +39,9 @@ pytest==7.3.2 \
     #   -r requirements.in
     #   pytest-flake8-path
     #   pytest-randomly
-pytest-flake8-path==1.3.0 \
-    --hash=sha256:a1f6a7f045e73b3400a59ad1a874dad39636a8d6bedef6e962396f863e05a4ac \
-    --hash=sha256:a3ddf053b56dbd1981f0e74ca02041e18f4e9f82435052358ffd2c147bf5a461
+pytest-flake8-path==1.4.0 \
+    --hash=sha256:b1c21f599158c90b68a16d301d1ffa19d25c297ef22f0ca4560160065a852e8b \
+    --hash=sha256:c873d169e4ea5ab889413212bc33eb13d653c0e7f6c630fce6dc982076a228b7
     # via -r requirements.in
 pytest-randomly==3.12.0 \
     --hash=sha256:d60c2db71ac319aee0fc6c4110a7597d611a8b94a5590918bfa8583f00caccb2 \

requirements/py38.txt

@@ -40,16 +40,16 @@ pyflakes==3.0.1 \
     --hash=sha256:ec55bf7fe21fff7f1ad2f7da62363d749e2a470500eab1b555334b67aa1ef8cf \
     --hash=sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd
     # via flake8
-pytest==7.3.1 \
-    --hash=sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362 \
-    --hash=sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3
+pytest==7.3.2 \
+    --hash=sha256:cdcbd012c9312258922f8cd3f1b62a6580fdced17db6014896053d47cddf9295 \
+    --hash=sha256:ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b
     # via
     #   -r requirements.in
     #   pytest-flake8-path
     #   pytest-randomly
-pytest-flake8-path==1.3.0 \
-    --hash=sha256:a1f6a7f045e73b3400a59ad1a874dad39636a8d6bedef6e962396f863e05a4ac \
-    --hash=sha256:a3ddf053b56dbd1981f0e74ca02041e18f4e9f82435052358ffd2c147bf5a461
+pytest-flake8-path==1.4.0 \
+    --hash=sha256:b1c21f599158c90b68a16d301d1ffa19d25c297ef22f0ca4560160065a852e8b \
+    --hash=sha256:c873d169e4ea5ab889413212bc33eb13d653c0e7f6c630fce6dc982076a228b7
     # via -r requirements.in
 pytest-randomly==3.12.0 \
     --hash=sha256:d60c2db71ac319aee0fc6c4110a7597d611a8b94a5590918bfa8583f00caccb2 \

requirements/py39.txt

@@ -40,16 +40,16 @@ pyflakes==3.0.1 \
     --hash=sha256:ec55bf7fe21fff7f1ad2f7da62363d749e2a470500eab1b555334b67aa1ef8cf \
     --hash=sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd
     # via flake8
-pytest==7.3.1 \
-    --hash=sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362 \
-    --hash=sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3
+pytest==7.3.2 \
+    --hash=sha256:cdcbd012c9312258922f8cd3f1b62a6580fdced17db6014896053d47cddf9295 \
+    --hash=sha256:ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b
     # via
     #   -r requirements.in
     #   pytest-flake8-path
     #   pytest-randomly
-pytest-flake8-path==1.3.0 \
-    --hash=sha256:a1f6a7f045e73b3400a59ad1a874dad39636a8d6bedef6e962396f863e05a4ac \
-    --hash=sha256:a3ddf053b56dbd1981f0e74ca02041e18f4e9f82435052358ffd2c147bf5a461
+pytest-flake8-path==1.4.0 \
+    --hash=sha256:b1c21f599158c90b68a16d301d1ffa19d25c297ef22f0ca4560160065a852e8b \
+    --hash=sha256:c873d169e4ea5ab889413212bc33eb13d653c0e7f6c630fce6dc982076a228b7
     # via -r requirements.in
 pytest-randomly==3.12.0 \
     --hash=sha256:d60c2db71ac319aee0fc6c4110a7597d611a8b94a5590918bfa8583f00caccb2 \

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = flake8_comprehensions
-version = 3.13.0
+version = 3.14.0
 description = A flake8 plugin to help you write better list/set/dict comprehensions.
 long_description = file: README.rst
 long_description_content_type = text/x-rst
@@ -17,7 +17,6 @@ classifiers =
     Natural Language :: English
     Programming Language :: Python :: 3
     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,8 +33,7 @@ project_urls =
 packages = find:
 install_requires =
     flake8!=3.2.0,>=3.0
-    importlib-metadata;python_version < "3.8"
-python_requires = >=3.7
+python_requires = >=3.8
 include_package_data = True
 package_dir =
     =src

src/flake8_comprehensions/__init__.py

@@ -1,15 +1,10 @@
 from __future__ import annotations
 
 import ast
-import sys
+from importlib.metadata import version
 from typing import Any
 from typing import Generator
 
-if sys.version_info >= (3, 8):
-    from importlib.metadata import version
-else:
-    from importlib_metadata import version
-
 
 class ComprehensionChecker:
     """

tests/test_flake8_comprehensions.py

@@ -1,16 +1,11 @@
 from __future__ import annotations
 
 import re
-import sys
+from importlib.metadata import version
 from textwrap import dedent
 
 import pytest
 
-if sys.version_info >= (3, 8):
-    from importlib.metadata import version
-else:
-    from importlib_metadata import version
-
 
 @pytest.fixture
 def flake8_path(flake8_path):
@@ -791,14 +786,6 @@ def test_C416_pass(code, flake8_path):
     assert result.out_lines == []
 
 
-# Column offset for list comprehensions was incorrect in Python < 3.8.
-# See https://bugs.python.org/issue31241 for details.
-if sys.version_info >= (3, 8):
-    list_comp_col_offset = 0
-else:
-    list_comp_col_offset = 1
-
-
 @pytest.mark.parametrize(
     "code,failures",
     [
@@ -819,7 +806,7 @@ def test_C416_pass(code, flake8_path):
         (
             "[x for x in range(5)]",
             [
-                f"./example.py:1:{1 + list_comp_col_offset}: C416 Unnecessary "
+                "./example.py:1:1: C416 Unnecessary "
                 + "list comprehension - rewrite using list()."
             ],
         ),

tox.ini

@@ -2,7 +2,7 @@
 requires =
     tox>=4.2
 env_list =
-    py{312, 311, 310, 39, 38, 37}
+    py{312, 311, 310, 39, 38}
 
 [testenv]
 package = wheel