test: require Python >= 3.6

Author: scop

.pre-commit-config.yaml

@@ -70,7 +70,7 @@ repos:
     rev: v2.7.4
     hooks:
       - id: pyupgrade
-        args: [--py3-plus, --keep-percent-format]
+        args: [--py36-plus, --keep-percent-format]
         exclude: ^completions/
 
   - repo: https://github.com/perltidy/perltidy

doc/testing.txt

@@ -23,7 +23,7 @@ Installing dependencies
 -----------------------
 
 Installing dependencies should be easy using your local package manager or
-`pip`. Python 3.4 or newer is required, and the rest of the Python package
+`pip`. Python 3.6 or newer is required, and the rest of the Python package
 dependencies are specified in the `test/requirements.txt` file. If using `pip`,
 this file can be fed directly to it, e.g. like:
 ------------------------------------

extra/make-changelog.py

@@ -9,7 +9,7 @@
 import git
 
 repo = git.Repo(".")
-changelog = defaultdict(list)  # type: Dict[str, List[str]]
+changelog: Dict[str, List[str]] = defaultdict(list)
 
 if len(sys.argv) != 2:
     print("Usage: %s SINCE-TAG" % __file__, file=sys.stderr)

pyproject.toml

@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 79
-target-version = ["py34", "py35", "py36", "py37", "py38"]
+target-version = ["py36", "py37", "py38"]

test/requirements.txt

@@ -1,5 +1,4 @@
-# Python >= 3.4 required here
+# Python >= 3.6 required here
 pexpect>=4
 pytest>=3.6
 pytest-xdist
-typing;python_version<"3.5"

test/setup.cfg

@@ -5,7 +5,7 @@ markers =
     complete
 
 [mypy]
-python_version = 3.4
+python_version = 3.6
 show_error_codes = true
 ignore_missing_imports = true
 

test/t/test_finger.py

@@ -26,8 +26,8 @@ def test_2(self, bash, completion, users_at):
     def test_partial_hostname(self, bash, known_hosts):
         first_char, partial_hosts = partialize(bash, known_hosts)
         user = "test"
-        completion = assert_complete(bash, "finger %s@%s" % (user, first_char))
+        completion = assert_complete(bash, f"finger {user}@{first_char}")
         if len(completion) == 1:
             assert completion == partial_hosts[0][1:]
         else:
-            assert completion == ["%s@%s" % (user, x) for x in partial_hosts]
+            assert completion == [f"{user}@{x}" for x in partial_hosts]

test/t/test_make.py

@@ -12,12 +12,12 @@ def test_1(self, completion):
     def test_2(self, bash, completion):
         """Hidden targets."""
         assert completion == ".cache/ .test_passes".split()
-        os.remove("%s/make/%s" % (bash.cwd, "extra_makefile"))
+        os.remove(f"{bash.cwd}/make/extra/makefile")
 
     @pytest.mark.complete("make .cache/", cwd="make", require_cmd=True)
     def test_3(self, bash, completion):
         assert completion == "1 2".split()
-        os.remove("%s/make/%s" % (bash.cwd, "extra_makefile"))
+        os.remove(f"{bash.cwd}/make/extra_makefile")
 
     @pytest.mark.complete("make ", cwd="shared/empty_dir")
     def test_4(self, completion):
@@ -30,17 +30,17 @@ def test_5(self, completion):
     @pytest.mark.complete("make ", cwd="make", require_cmd=True)
     def test_6(self, bash, completion):
         assert completion == "all clean extra_makefile install sample".split()
-        os.remove("%s/make/%s" % (bash.cwd, "extra_makefile"))
+        os.remove(f"{bash.cwd}/make/extra_makefile")
 
     @pytest.mark.complete("make .cache/.", cwd="make", require_cmd=True)
     def test_7(self, bash, completion):
         assert completion == ".1 .2".split()
-        os.remove("%s/make/%s" % (bash.cwd, "extra_makefile"))
+        os.remove(f"{bash.cwd}/make/extra_makefile")
 
     @pytest.mark.complete("make -C make ", require_cmd=True)
     def test_8(self, bash, completion):
         assert completion == "all clean extra_makefile install sample".split()
-        os.remove("%s/make/%s" % (bash.cwd, "extra_makefile"))
+        os.remove(f"{bash.cwd}/make/extra_makefile")
 
     @pytest.mark.complete("make -", require_cmd=True)
     def test_9(self, completion):

test/t/test_mutt.py

@@ -28,6 +28,6 @@ def test_4(self, bash):
             .split()
         )
         assert got == [
-            "%s/mutt/%s" % (bash.cwd, x)
+            f"{bash.cwd}/mutt/{x}"
             for x in ("muttrc", "bar/muttrc_b", "foo/muttrc_f")
         ]

test/t/test_scp.py

@@ -76,4 +76,4 @@ def test_live(self, live_pwd, completion):
         Connection to it must open sufficiently quickly for the
         ConnectTimeout and sleep_after_tab settings.
         """
-        assert completion == "%s:%s/" % (LIVE_HOST, live_pwd)
+        assert completion == f"{LIVE_HOST}:{live_pwd}/"