#308 Python 3.7 support dropped & Improved Type Comment Analysis

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
       - uses: actions/[email protected]
 

docs/CHANGELOG.md

@@ -4,11 +4,32 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - YYYY-MM-DD
 
-## [1.2.0] - 2023-12-03
+## [1.2.0] - 2023-12-22
 
 ### Changed
 
 - Python 3.6 support dropped
+- Python 3.7 support dropped
+
+### Fixed
+
+- Improved Type Comment Analysis
+
+  > To ensure accurate type comment analysis, a crucial fix was implemented in the code.
+  > The update involves refining the process by adding a check within ast.AnnAssign and
+  > ast.arg types. Specifically, the code now includes a verification that
+  > visit_Constant occurs under an annotation, addressing unnecessary name discovery
+  > issues for better accuracy in type_comment assessment.
+
+  ```python
+  import sys
+  from typing import (
+      List,
+  )
+
+
+  test_list: List[str] = ["spam", "eggs"]  # it thought spam and eggs were a ast.Name object.
+  ```
 
 ## [1.1.0] - 2023-11-17
 

docs/CONTRIBUTING.md

@@ -35,10 +35,10 @@ $ git rebase upstream/main
 
 ## Testing
 
-First, make sure you have at least one of the python versions py3.7, py3.8, py3.9,
-py3.10 and py3.11. If not all versions are available, after opening PR, github action
-will run the tests for each version, so you can be sure that you wrote the correct code.
-You can skip the tox step below.
+First, make sure you have at least one of the python versions py3.8, py3.9, py3.10 and
+py3.11. If not all versions are available, after opening PR, github action will run the
+tests for each version, so you can be sure that you wrote the correct code. You can skip
+the tox step below.
 
 After typing your codes, you should run the tests by typing the following command.
 

docs/index.md

@@ -29,5 +29,5 @@ process with Unimport.
 
 - **Documentation** https://unimport.hakancelik.dev/
 - **Issues** https://github.com/hakancelikdev/unimport/issues/
-- **Changelog** https://unimport.hakancelik.dev/1.1.0/CHANGELOG/
+- **Changelog** https://unimport.hakancelik.dev/1.2.0/CHANGELOG/
 - **Playground** https://playground-unimport.hakancelik.dev/

docs/installation.md

@@ -1,4 +1,4 @@
-Unimport requires Python 3.7+ and can be easily installed using most common Python
+Unimport requires Python 3.8+ and can be easily installed using most common Python
 packaging tools. We recommend installing the latest stable release from PyPI with pip:
 
 ```shell

docs/tutorial/other-useful-features.md

@@ -14,8 +14,8 @@ from x import ( # noqa
 )
 ```
 
-**If version of your python is 3.8+** Unimport support multiple skip like below. _It
-doesn't matter which line you put the comment on._
+Unimport support multiple skip like below. _It doesn't matter which line you put the
+comment on._
 
 ```python
 from package import (

docs/tutorial/supported-behaviors.md

@@ -36,9 +36,7 @@ def test(arg: "List['Dict']") -> None:
 
 #### Comments
 
-**This feature is only available for python 3.8.**
-
-Imports in the example below aren't flag as unused by import.
+Imports in the example below aren't flag as unused by unimport.
 
 ```python
 from typing import Any

docs/tutorial/use-with-github-action.md

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/[email protected]
       - uses: actions/[email protected]
       - name: Check unused imports
-        uses: hakancelikdev/unimport@1.1.0
+        uses: hakancelikdev/unimport@1.2.0
         with:
           extra_args: --include src/
 ```

mkdocs.yml

@@ -6,7 +6,7 @@ site_url: https://unimport.hakancelik.dev
 repo_url: https://github.com/hakancelikdev/unimport
 repo_name: hakancelikdev/unimport
 edit_uri: https://github.com/hakancelikdev/unimport/tree/main/docs
-copyright: Copyright © 2020 - 2023 Hakan Çelik
+copyright: Copyright © 2019 - 2024 Hakan Çelik
 
 markdown_extensions:
   - fenced_code
@@ -132,4 +132,3 @@ nav:
   - Contributing: CONTRIBUTING.md
   - Changelog: CHANGELOG.md
   - Authors: AUTHORS.md
-  - FAQ: FAQ.md

pyproject.toml

@@ -21,7 +21,7 @@ skip_gitignore = true
 
 [tool.black]
 line-length = 120
-target-version = ['py37', 'py38', 'py39', 'py310']
+target-version = ['py38', 'py39', 'py310', 'py311']
 
 [tool.unimport]
 include_star_import = true

setup.cfg

@@ -18,7 +18,6 @@ classifiers =
     Programming Language :: Python
     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
@@ -29,10 +28,10 @@ classifiers =
 project_urls =
     Documentation = https://unimport.hakancelik.dev/
     Issues = https://github.com/hakancelikdev/unimport/issues/
-    Changelog = https://unimport.hakancelik.dev/1.1.0/CHANGELOG/
+    Changelog = https://unimport.hakancelik.dev/1.2.0/CHANGELOG/
 
 [options]
-python_requires = >=3.7, <3.12
+python_requires = >=3.8, <3.12
 include_package_data = true
 zip_safe = true
 packages =
@@ -46,10 +45,8 @@ install_requires =
     libcst>=0.3.7, <=1.1.0; python_version == '3.10'
     libcst>=0.3.7, <=1.1.0; python_version == '3.9'
     libcst>=0.3.0, <=1.1.0; python_version == '3.8'
-    libcst>=0.3.0, <=1.0.1; python_version == '3.7'
-    pathspec>=0.10.1, <1; python_version >= '3.7'
+    pathspec>=0.10.1, <1
     toml>=0.9.0, <1
-    typing-extensions>=3.7.4, <4; python_version < '3.8'
 
 [options.entry_points]
 console_scripts =

src/unimport/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 __description__ = "A linter, formatter for finding and removing unused import statements."

src/unimport/analyzers/decarators.py

@@ -2,7 +2,6 @@
 import re
 from typing import cast
 
-from unimport import constants as C
 from unimport import typing as T
 
 __all__ = ("generic_visit", "skip_import")
@@ -22,11 +21,7 @@ def skip_import(func: T.FunctionT) -> T.FunctionT:
 
     @functools.wraps(func)
     def wrapper(self, node, *args, **kwargs):
-        if C.PY38_PLUS:
-            source_segment = "\n".join(self.source.splitlines()[node.lineno - 1 : node.end_lineno])
-        else:
-            source_segment = self.source.splitlines()[node.lineno - 1]
-
+        source_segment = "\n".join(self.source.splitlines()[node.lineno - 1 : node.end_lineno])
         skip_comment = bool(re.search(SKIP_IMPORT_COMMENTS_REGEX, source_segment, re.IGNORECASE))
         if not any((skip_comment, self.any_import_error)):
             func(self, node, *args, **kwargs)

src/unimport/analyzers/importable.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import ast
-from typing import FrozenSet, List
 
 from unimport import constants as C
 from unimport import typing as T
@@ -18,17 +19,14 @@ class ImportableAnalyzer(ast.NodeVisitor):
     )
 
     def __init__(self) -> None:
-        self.importable_nodes: List[T.ASTNameType] = []  # nodes on the __all__ list
-        self.suggestions_nodes: List[T.ASTImportableT] = []  # nodes on the CFN
+        self.importable_nodes: list[ast.Constant] = []  # nodes on the __all__ list
+        self.suggestions_nodes: list[T.ASTImportableT] = []  # nodes on the CFN
 
     def traverse(self, tree):
         self.visit(tree)
 
         for node in self.importable_nodes:
-            if isinstance(node, ast.Constant):
-                Name.register(lineno=node.lineno, name=str(node.value), node=node, is_all=True)
-            elif isinstance(node, ast.Str):
-                Name.register(lineno=node.lineno, name=node.s, node=node, is_all=True)
+            Name.register(lineno=node.lineno, name=node.value, node=node, is_all=True)
 
         self.clear()
 
@@ -61,7 +59,7 @@ def visit_ImportFrom(self, node: ast.ImportFrom) -> None:
     def visit_Assign(self, node: ast.Assign) -> None:
         if getattr(node.targets[0], "id", None) == "__all__" and isinstance(node.value, (ast.List, ast.Tuple, ast.Set)):
             for item in node.value.elts:
-                if isinstance(item, (ast.Constant, ast.Str)):
+                if isinstance(item, ast.Constant) and isinstance(item.value, str):
                     self.importable_nodes.append(item)
 
         for target in node.targets:  # we only get assigned names
@@ -78,18 +76,18 @@ def visit_Expr(self, node: ast.Expr) -> None:
         ):
             if node.value.func.attr == "append":
                 for arg in node.value.args:
-                    if isinstance(arg, (ast.Constant, ast.Str)):
+                    if isinstance(arg, ast.Constant) and isinstance(arg.value, str):
                         self.importable_nodes.append(arg)
 
             elif node.value.func.attr == "extend":
                 for arg in node.value.args:
                     if isinstance(arg, ast.List):
                         for item in arg.elts:
-                            if isinstance(item, (ast.Constant, ast.Str)):
+                            if isinstance(item, ast.Constant) and isinstance(item.value, str):
                                 self.importable_nodes.append(item)
 
     @classmethod
-    def get_names(cls, package: str) -> FrozenSet[str]:
+    def get_names(cls, package: str) -> frozenset[str]:
         if utils.is_std(package):
             return utils.get_dir(package)
 
@@ -106,16 +104,13 @@ def get_names(cls, package: str) -> FrozenSet[str]:
                 return visitor.get_all() or visitor.get_suggestion()
         return frozenset()
 
-    def get_all(self) -> FrozenSet[str]:
+    def get_all(self) -> frozenset[str]:
         names = set()
         for node in self.importable_nodes:
-            if isinstance(node, ast.Constant):
-                names.add(node.value)
-            elif isinstance(node, ast.Str):
-                names.add(node.s)
+            names.add(node.value)
         return frozenset(names)
 
-    def get_suggestion(self) -> FrozenSet[str]:
+    def get_suggestion(self) -> frozenset[str]:
         names = set()
         for node in self.suggestions_nodes:  # type: ignore
             if isinstance(node, ast.Name):

src/unimport/analyzers/main.py

@@ -2,7 +2,6 @@
 import re
 from pathlib import Path
 
-from unimport import constants as C
 from unimport.analyzers.import_statement import ImportAnalyzer
 from unimport.analyzers.importable import ImportableAnalyzer
 from unimport.analyzers.name import NameAnalyzer
@@ -31,7 +30,7 @@ def traverse(self) -> None:
         if self.skip_file():
             return None
 
-        tree = ast.parse(self.source, type_comments=True) if C.PY38_PLUS else ast.parse(self.source)
+        tree = ast.parse(self.source, type_comments=True)
 
         set_tree_parents(tree)  # set parents to tree