Support newer pyupgrade versions (up to 2.10)

domdfcoding · domdfcoding · commit 77e911a9d0de · 2021-02-28T20:08:28.000Z
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -19,12 +19,12 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-pyupgrade{2.5,2.6,2.7},build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy3-pyupgrade{2.5,2.6,2.7},build", experimental: False}
+          - {python-version: "3.6", testenvs: "py36-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: True}
+          - {python-version: "pypy-3.6", testenvs: "pypy3-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
 
     steps:
       - name: Checkout 🛎️
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -19,12 +19,12 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-pyupgrade{2.5,2.6,2.7},build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy3-pyupgrade{2.5,2.6,2.7},build", experimental: False}
+          - {python-version: "3.6", testenvs: "py36-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: True}
+          - {python-version: "pypy-3.6", testenvs: "pypy3-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
 
     steps:
       - name: Checkout 🛎️
diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -19,12 +19,12 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-pyupgrade{2.5,2.6,2.7},build", experimental: False}
-          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-pyupgrade{2.5,2.6,2.7},build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy3-pyupgrade{2.5,2.6,2.7},build", experimental: False}
+          - {python-version: "3.6", testenvs: "py36-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
+          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: True}
+          - {python-version: "pypy-3.6", testenvs: "pypy3-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10},build", experimental: False}
 
     steps:
       - name: Checkout 🛎️
diff --git a/pyupgrade_directories/__init__.py b/pyupgrade_directories/__init__.py
@@ -13,24 +13,26 @@
 import pathlib
 from typing import Iterable, List
 
-__all__ = ["iter_py_files"]
-
 __author__ = "Dominic Davis-Foster"
 __copyright__ = "2020 Dominic Davis-Foster"
 __license__ = "MIT"
 __version__ = "0.1.1"
 __email__ = "dominic@davis-foster.co.uk"
 
+__all__ = ["iter_py_files"]
+
 
-def iter_py_files(files_and_dirs: Iterable[pathlib.Path], recursive: bool = False) -> Iterable[pathlib.Path]:
+def iter_py_files(
+		files_and_dirs: Iterable[pathlib.Path],
+		recursive: bool = False,
+		) -> Iterable[pathlib.Path]:
 	"""
 	Iterate over all ``.py`` files in the given directories.
 
 	TODO: Wildcards in filename/directory
 
 	:param files_and_dirs: An iterable of filenames and directories
-	:param recursive: Whether subdirectories should be recursed. Default :py:obj:`False`
-	:type recursive: bool
+	:param recursive: Whether subdirectories should be recursed.
 	"""
 
 	all_py_files: List[pathlib.Path] = []
diff --git a/pyupgrade_directories/__main__.py b/pyupgrade_directories/__main__.py
@@ -5,7 +5,7 @@
 Run pyupgrade on all files in a directory, and optionally recursively.
 """
 #
-#  Copyright (c) 2020 Dominic Davis-Foster <dominic@davis-foster.co.uk>
+#  Copyright (c) 2020-2021 Dominic Davis-Foster <dominic@davis-foster.co.uk>
 #  Based on pyupgrade
 #  https://github.com/asottile/pyupgrade
 #  Copyright (c) 2017 Anthony Sottile
@@ -15,51 +15,40 @@
 # stdlib
 import argparse
 import pathlib
+import sys
 from typing import Optional, Sequence
 
-# 3rd party
-from pyupgrade import _fix_file  # type: ignore
-
 # this package
 from pyupgrade_directories import iter_py_files
 
+try:
+	# < 2.8.0
+
+	# 3rd party
+	from pyupgrade import main as _pyup_main  # type: ignore
+
+except ImportError:
+	# 2.8.0+
+
+	# 3rd party
+	from pyupgrade._main import main as _pyup_main  # type: ignore
+
 __all__ = ["main"]
 
 
 def main(argv: Optional[Sequence[str]] = None) -> int:
 	"""
 	Entry point for ``pyupgrade_directories``.
-
-	:rtype: int
 	"""
 
-	parser = argparse.ArgumentParser()
+	parser = argparse.ArgumentParser(add_help=False)
 	parser.add_argument("filenames", nargs='*', type=pathlib.Path)
-	parser.add_argument("--exit-zero-even-if-changed", action="store_true")
-	parser.add_argument("--keep-percent-format", action="store_true")
-	parser.add_argument("--keep-mock", action="store_true")
-	parser.add_argument(
-			"--py3-plus",
-			"--py3-only",
-			action="store_const",
-			dest="min_version",
-			default=(2, 7),
-			const=(3, ),
-			)
-	parser.add_argument("--py36-plus", action="store_const", dest="min_version", const=(3, 6))
-	parser.add_argument("--py37-plus", action="store_const", dest="min_version", const=(3, 7))
-	parser.add_argument("--py38-plus", action="store_const", dest="min_version", const=(3, 8))
 	parser.add_argument("--recursive", action="store_true", help="recurse subdirectories")
-	args = parser.parse_args(argv)
-
-	ret = 0
 
-	for filename in iter_py_files(args.filenames, args.recursive):
-		print(f"Checking '{filename}'")
-		ret |= _fix_file(str(filename), args)
+	args, argv = parser.parse_known_args(argv)
 
-	return ret
+	return _pyup_main([*map(str, iter_py_files(args.filenames, args.recursive)), *argv])
 
 
 if __name__ == "__main__":
-	exit(main())
+	sys.exit(main())
diff --git a/repo_helper.yml b/repo_helper.yml
@@ -48,3 +48,6 @@ third_party_version_matrix:
     - "2.5"
     - "2.6"
     - "2.7"
+    - "2.8"
+    - "2.9"
+    - "2.10"
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-pyupgrade<2.8.0,>=2.5.0
+pyupgrade<2.11.0,>=2.5.0
diff --git a/tox.ini b/tox.ini
@@ -14,12 +14,12 @@
 
 [tox]
 envlist =
-    py36-pyupgrade{2.5,2.6,2.7}
-    py37-pyupgrade{2.5,2.6,2.7}
-    py38-pyupgrade{2.5,2.6,2.7}
-    py39-pyupgrade{2.5,2.6,2.7}
-    py310-dev-pyupgrade{2.5,2.6,2.7}
-    pypy3-pyupgrade{2.5,2.6,2.7}
+    py36-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    py37-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    py38-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    py39-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    py310-dev-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    pypy3-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
     mypy
     build
 skip_missing_interpreters = True
@@ -31,12 +31,12 @@ requires =
 
 [envlists]
 test =
-    py36-pyupgrade{2.5,2.6,2.7}
-    py37-pyupgrade{2.5,2.6,2.7}
-    py38-pyupgrade{2.5,2.6,2.7}
-    py39-pyupgrade{2.5,2.6,2.7}
-    py310-dev-pyupgrade{2.5,2.6,2.7}
-    pypy3-pyupgrade{2.5,2.6,2.7}
+    py36-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    py37-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    py38-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    py39-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    py310-dev-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
+    pypy3-pyupgrade{2.5,2.6,2.7,2.8,2.9,2.10}
 qa = mypy, lint
 
 [testenv]
@@ -46,6 +46,9 @@ deps =
     pyupgrade2.5: pyupgrade~=2.5.0
     pyupgrade2.6: pyupgrade~=2.6.0
     pyupgrade2.7: pyupgrade~=2.7.0
+    pyupgrade2.8: pyupgrade~=2.8.0
+    pyupgrade2.9: pyupgrade~=2.9.0
+    pyupgrade2.10: pyupgrade~=2.10.0
 commands =
     python --version
     python -m importcheck {posargs}
@@ -143,51 +146,5 @@ exclude_lines =
     if __name__ == .__main__.:
     \.\.\.
 
-[gh-actions]
-python =
-    3.6: py36, build, mypy
-    3.7: py37, build
-    3.8: py38, build
-    3.9: py39, build
-    3.10-dev: py310-dev, build
-    pypy3: pypy3, build
-
-[travis]
-python =
-    3.6: py36, build, mypy
-    3.7: py37, build
-    3.8: py38, build
-    3.9: py39, build
-    3.10-dev: py310-dev, build
-    pypy3: pypy3, build
-
-[testenv:yapf]
-basepython = python3.7
-changedir = {toxinidir}
-skip_install = True
-ignore_errors = True
-deps = yapf
-commands = yapf -i --recursive pyupgrade_directories
-
-[testenv:bumpversion]
-skip_install = true
-deps = bump2version
-commands = bumpversion --verbose {posargs}
-
-
-[testenv:isort]
-basepython = python3.6
-skip_install = true
-ignore_errors = true
-changedir = {toxinidir}
-deps = isort >=5.1.4
-commands = isort pyupgrade_directories
-
-
-[testenv:qa]
-basepython = python3.6
-skip_install = True
-ignore_errors = true
-whitelist_externals = tox
-changedir = {toxinidir}
-commands = tox -e pyup,isort,yapf,mypy,lint {posargs}
+[dep_checker]
+allowed_unused = pyupgrade

-Original file line number
+Diff line change
     - "2.5"
     - "2.6"
     - "2.7"
 +    - "2.8"
 +    - "2.9"
 +    - "2.10"
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-pyupgrade<2.8.0,>=2.5.0`
	`1`	`+pyupgrade<2.11.0,>=2.5.0`