Drop 3.5 add 3.9

Author: Bachmann1234

.travis.yml

@@ -5,16 +5,17 @@ matrix:
   include:
   - python: pypy3
     env: TOXENV=pypy3
+  - python: 3.9
+    env:
+      - TOXENV=py39
+      - BLACKEN=true
   - python: 3.8
     env:
       - TOXENV=py38
-      - BLACKEN=true
   - python: 3.7
     env: TOXENV=py37
   - python: 3.6
     env: TOXENV=py36
-  - python: 3.5
-    env: TOXENV=py35
 install:
 - if [ ${BLACKEN} ]; then travis_retry pip install black; fi
 - travis_retry pip install coveralls tox

diff_cover/diff_cover_tool.py

@@ -143,9 +143,7 @@ def parse_coverage_args(argv):
         help=DIFF_RANGE_NOTATION_HELP,
     )
 
-    parser.add_argument(
-        "--version", action="version", version="diff-cover {}".format(VERSION)
-    )
+    parser.add_argument("--version", action="version", version=f"diff-cover {VERSION}")
 
     parser.add_argument(
         "--ignore-whitespace",
@@ -247,7 +245,7 @@ def main(argv=None, directory=None):
     if percent_covered >= fail_under:
         return 0
     else:
-        LOGGER.error("Failure. Coverage is below {}%.".format(fail_under))
+        LOGGER.error(f"Failure. Coverage is below {fail_under}%.")
         return 1
 
 

diff_cover/diff_quality_tool.py

@@ -153,7 +153,7 @@ def parse_quality_args(argv):
     parser.add_argument(
         "--version",
         action="version",
-        version="diff-quality {}".format(diff_cover.VERSION),
+        version=f"diff-quality {diff_cover.VERSION}",
     )
     parser.add_argument(
         "--ignore-whitespace",
@@ -256,7 +256,7 @@ def main(argv=None, directory=None):
                     try:
                         input_reports.append(open(path, "rb"))
                     except OSError:
-                        LOGGER.warning("Could not load '{}'".format(path))
+                        LOGGER.warning(f"Could not load '{path}'")
                 reporter = QualityReporter(driver, input_reports, user_options)
 
             percent_passing = generate_quality_report(
@@ -273,22 +273,22 @@ def main(argv=None, directory=None):
             if percent_passing >= fail_under:
                 return 0
             else:
-                LOGGER.error("Failure. Quality is below {}%.".format(fail_under))
+                LOGGER.error(f"Failure. Quality is below {fail_under}%.")
                 return 1
 
         except ImportError:
-            LOGGER.error("Quality tool not installed: '{}'".format(tool))
+            LOGGER.error(f"Quality tool not installed: '{tool}'")
             return 1
         except OSError as exc:
-            LOGGER.error("Failure: '{}'".format(exc))
+            LOGGER.error(f"Failure: '{exc}'")
             return 1
         # Close any reports we opened
         finally:
             for file_handle in input_reports:
                 file_handle.close()
 
     else:
-        LOGGER.error("Quality tool not recognized: '{}'".format(tool))
+        LOGGER.error(f"Quality tool not recognized: '{tool}'")
         return 1
 
 

diff_cover/diff_reporter.py

@@ -116,7 +116,7 @@ def __init__(
             options.append("unstaged")
 
         # Branch is always present, so use as basis for name
-        name = "{}...HEAD".format(compare_branch)
+        name = f"{compare_branch}...HEAD"
         if len(options) > 0:
             # If more options are present separate them by comma's, except the last one
             for item in options[:-1]:
@@ -319,7 +319,7 @@ def _parse_source_sections(self, diff_str):
                         # We tolerate other information before we have
                         # a source file defined, unless it's a hunk line
                         if line.startswith("@@"):
-                            msg = "Hunk has no source file: '{}'".format(line)
+                            msg = f"Hunk has no source file: '{line}'"
                             raise GitDiffError(msg)
 
         return source_dict
@@ -404,7 +404,7 @@ def _parse_source_line(self, line):
         elif "--cc" in line:
             regex = self.MERGE_CONFLICT_RE
         else:
-            msg = "Do not recognize format of source in line '{}'".format(line)
+            msg = f"Do not recognize format of source in line '{line}'"
             raise GitDiffError(msg)
 
         # Parse for the source file path
@@ -414,7 +414,7 @@ def _parse_source_line(self, line):
             return groups[0]
 
         else:
-            msg = "Could not parse source path in line '{}'".format(line)
+            msg = f"Could not parse source path in line '{line}'"
             raise GitDiffError(msg)
 
     def _parse_hunk_line(self, line):
@@ -455,11 +455,11 @@ def _parse_hunk_line(self, line):
                     raise GitDiffError(msg)
 
             else:
-                msg = "Could not find start of hunk in line '{}'".format(line)
+                msg = f"Could not find start of hunk in line '{line}'"
                 raise GitDiffError(msg)
 
         else:
-            msg = "Could not parse hunk in line '{}'".format(line)
+            msg = f"Could not parse hunk in line '{line}'"
             raise GitDiffError(msg)
 
     @staticmethod

diff_cover/tests/helpers.py

@@ -122,16 +122,16 @@ def _deleted_file_entries(deleted_files):
 
         for src_file in deleted_files:
             # File information
-            output.append("diff --git a/{} b/{}".format(src_file, src_file))
+            output.append(f"diff --git a/{src_file} b/{src_file}")
             output.append("index 629e8ad..91b8c0a 100644")
-            output.append("--- a/{}".format(src_file))
+            output.append(f"--- a/{src_file}")
             output.append("+++ b/dev/null")
 
             # Choose a random number of lines
             num_lines = random.randint(1, 30)
 
             # Hunk information
-            output.append("@@ -0,{} +0,0 @@".format(num_lines))
+            output.append(f"@@ -0,{num_lines} +0,0 @@")
             output.extend(["-" + _random_string() for _ in range(num_lines)])
 
     return output
@@ -150,14 +150,14 @@ def _source_file_entry(src_file, modified_lines):
     output = []
 
     # Line for the file names
-    output.append("diff --git a/{} b/{}".format(src_file, src_file))
+    output.append(f"diff --git a/{src_file} b/{src_file}")
 
     # Index line
     output.append("index 629e8ad..91b8c0a 100644")
 
     # Additions/deletions
-    output.append("--- a/{}".format(src_file))
-    output.append("+++ b/{}".format(src_file))
+    output.append(f"--- a/{src_file}")
+    output.append(f"+++ b/{src_file}")
 
     # Hunk information
     for (start, end) in _hunks(modified_lines):

diff_cover/tests/test_diff_quality_main.py

@@ -62,7 +62,7 @@ def test_parse_invalid_arg(self):
 
         for argv in invalid_argv:
             with self.assertRaises(SystemExit):
-                print("args = {}".format(argv))
+                print(f"args = {argv}")
                 parse_quality_args(argv)
 
     def test_parse_with_exclude(self):

diff_cover/tests/test_diff_reporter.py

@@ -408,7 +408,7 @@ def test_git_diff_error(self):
                 self.diff.src_paths_changed()
 
             with self.assertRaises(GitDiffError):
-                print("lines_changed() should fail for {}".format(diff_str))
+                print(f"lines_changed() should fail for {diff_str}")
                 self.diff.lines_changed("subdir/file1.py")
 
     def test_plus_sign_in_hunk_bug(self):

diff_cover/tests/test_git_diff.py

@@ -42,7 +42,7 @@ def check_diff_committed(self, diff_range_notation, ignore_whitespace):
         if ignore_whitespace:
             expected.append("--ignore-all-space")
             expected.append("--ignore-blank-lines")
-        expected.append("origin/master{}HEAD".format(diff_range_notation))
+        expected.append(f"origin/master{diff_range_notation}HEAD")
         self.subprocess.Popen.assert_called_with(
             expected, stdout=self.subprocess.PIPE, stderr=self.subprocess.PIPE
         )

diff_cover/tests/test_integration.py

@@ -42,11 +42,11 @@ def setUp(self):
         cwd = os.getcwd()
 
         self._mock_popen = patch("subprocess.Popen").start()
-        self._mock_sys = patch("{}.sys".format(self.tool_module)).start()
+        self._mock_sys = patch(f"{self.tool_module}.sys").start()
         try:
-            self._mock_getcwd = patch("{}.os.getcwdu".format(self.tool_module)).start()
+            self._mock_getcwd = patch(f"{self.tool_module}.os.getcwdu").start()
         except AttributeError:
-            self._mock_getcwd = patch("{}.os.getcwd".format(self.tool_module)).start()
+            self._mock_getcwd = patch(f"{self.tool_module}.os.getcwd").start()
         self._git_root_path = cwd
         self._mock_getcwd.return_value = self._git_root_path
 
@@ -559,7 +559,7 @@ def _call_quality_expecting_error(
         """
         with open("git_diff_add.txt", encoding="utf-8") as git_diff_file:
             self._set_git_diff_output(git_diff_file.read(), "")
-        argv = ["diff-quality", "--violations={}".format(tool_name), report_arg]
+        argv = ["diff-quality", f"--violations={tool_name}", report_arg]
 
         with patch("diff_cover.diff_quality_tool.LOGGER") as logger:
             exit_value = diff_quality_main(argv)

diff_cover/tests/test_snippets.py

@@ -301,5 +301,5 @@ def _src_lines(self, start_line, end_line):
         (Line 1, Line 2, ...).
         """
         return "\n".join(
-            ["Line {}".format(line_num) for line_num in range(start_line, end_line + 1)]
+            [f"Line {line_num}" for line_num in range(start_line, end_line + 1)]
         )

diff_cover/violationsreporters/base.py

@@ -148,7 +148,7 @@ def violations(self, src_path):
                 if self.driver_tool_installed is None:
                     self.driver_tool_installed = self.driver.installed()
                 if not self.driver_tool_installed:
-                    raise OSError("{} is not installed".format(self.driver.name))
+                    raise OSError(f"{self.driver.name} is not installed")
                 command = copy.deepcopy(self.driver.command)
                 if self.options:
                     command.append(self.options)

diff_cover/violationsreporters/java_violations_reporter.py

@@ -120,7 +120,7 @@ def parse_reports(self, reports):
                 start = int(line.get("start"))
                 end = int(line.get("end"))
                 for line_number in range(start, end + 1):
-                    error_str = "{}: {}".format(category, short_message)
+                    error_str = f"{category}: {short_message}"
                     violation = Violation(line_number, error_str)
                     filename = GitPathTool.relative_path(line.get("sourcepath"))
                     violations_dict[filename].append(violation)

diff_cover/violationsreporters/violations_reporter.py

@@ -465,7 +465,7 @@ def parse_reports(self, reports):
                                 pylint_code, function_name, message
                             )
                         else:
-                            error_str = "{}: {}".format(pylint_code, message)
+                            error_str = f"{pylint_code}: {message}"
 
                         violation = Violation(int(line_number), error_str)
                         violations_dict[pylint_src_path].append(violation)

requirements/requirements.txt

@@ -1,5 +1,4 @@
 # Production requirements
-inflect==3.0.2 # remove when you drop support for python3.5
 pygments
 Jinja2>=2.7.1
 jinja2_pluralize

setup.py

@@ -16,7 +16,7 @@
     test_suite="nose.collector",
     description=DESCRIPTION,
     license="Apache 2.0",
-    python_requires=">= 3.5",
+    python_requires=">= 3.6",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
@@ -25,9 +25,10 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Software Development :: Testing",

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, py36, py37, py38, pypy3
+envlist = py36, py37, py38, py39, pypy3
 
 [testenv]
 whitelist_externals =