Drop Python 2.7, release 2.0.0 (#10)

Author: johnthagen

.travis.yml

@@ -2,8 +2,6 @@ language: python
 dist: xenial
 matrix:
     include:
-        - python: 2.7
-          env: TOXENV=py27
         - python: 3.5
           env: TOXENV=py35
         - python: 3.6
@@ -12,8 +10,6 @@ matrix:
           env: TOXENV=py37
         - python: 3.8
           env: TOXENV=py38
-        - python: pypy
-          env: TOXENV=pypy
         - python: pypy3
           env: TOXENV=pypy3
 

README.rst

@@ -57,6 +57,11 @@ output so that CI tools like Bamboo will not fail on the JUnit task.
 Releases
 --------
 
+2.0.0 - 2020-03-29
+^^^^^^^^^^^^^^^^^^
+
+- Drop Python 2.7
+
 1.7.0 - 2019-12-14
 ^^^^^^^^^^^^^^^^^^
 

cppcheck_junit.py

@@ -2,30 +2,21 @@
 
 """Converts Cppcheck XML version 2 output to JUnit XML format."""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import argparse
 import collections
 from datetime import datetime
 import os
 from socket import gethostname
 import sys
-from typing import Dict, List  # noqa: F401
+from typing import Dict, List
 from xml.etree import ElementTree
 
 from exitstatus import ExitStatus
 
 
-class CppcheckError(object):
-    def __init__(self,
-                 file,  # type: str
-                 line,  # type: int
-                 message,  # type: str
-                 severity,  # type: str
-                 error_id,  # type: str
-                 verbose  # type: str
-                 ):
-        # type: (...) -> CppcheckError
+class CppcheckError:
+    def __init__(self, file: str, line: int, message: str, severity: str, error_id: str,
+                 verbose: str) -> None:
         """Constructor.
 
         Args:
@@ -44,8 +35,7 @@ def __init__(self,
         self.verbose = verbose
 
 
-def parse_arguments():
-    # type: () -> argparse.Namespace
+def parse_arguments() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         description='Converts Cppcheck XML version 2 to JUnit XML format.\n'
                     'Usage:\n'
@@ -57,8 +47,7 @@ def parse_arguments():
     return parser.parse_args()
 
 
-def parse_cppcheck(file_name):
-    # type: (str) -> Dict[str, List[CppcheckError]]
+def parse_cppcheck(file_name: str) -> Dict[str, List[CppcheckError]]:
     """Parses a Cppcheck XML version 2 file.
 
     Args:
@@ -75,7 +64,7 @@ def parse_cppcheck(file_name):
     root = ElementTree.parse(file_name).getroot()  # type: ElementTree.Element
 
     if (root.get('version') is None or
-       int(root.get('version')) != 2):
+            int(root.get('version')) != 2):
         raise ValueError('Parser only supports Cppcheck XML version 2.  Use --xml-version=2.')
 
     error_root = root.find('errors')
@@ -101,8 +90,7 @@ def parse_cppcheck(file_name):
     return errors
 
 
-def generate_test_suite(errors):
-    # type: (Dict[str, List[CppcheckError]]) -> ElementTree.ElementTree
+def generate_test_suite(errors: Dict[str, List[CppcheckError]]) -> ElementTree.ElementTree:
     """Converts parsed Cppcheck errors into JUnit XML tree.
 
     Args:
@@ -140,8 +128,7 @@ def generate_test_suite(errors):
     return ElementTree.ElementTree(test_suite)
 
 
-def generate_single_success_test_suite():
-    # type: () -> ElementTree.ElementTree
+def generate_single_success_test_suite() -> ElementTree.ElementTree:
     """Generates a single successful JUnit XML testcase."""
     test_suite = ElementTree.Element('testsuite')
     test_suite.attrib['name'] = 'Cppcheck errors'
@@ -159,8 +146,7 @@ def generate_single_success_test_suite():
     return ElementTree.ElementTree(test_suite)
 
 
-def main():  # pragma: no cover
-    # type: () -> ExitStatus
+def main() -> ExitStatus:  # pragma: no cover
     """Main function.
 
     Returns:

requirements-dev.txt dev-requirements.txtrequirements-dev.txt renamed to dev-requirements.txt

@@ -1,3 +1,4 @@
+tox
 flake8>=3.0.3
 pep8-naming
 flake8-quotes

requirements.txt

@@ -1,2 +1 @@
-exitstatus>=1.0.0
-typing
+exitstatus>=1.0.0

setup.cfg

@@ -3,7 +3,7 @@
 
 setup(
     name='cppcheck-junit',
-    version='1.7.0',
+    version='2.0.0',
 
     description='Converts Cppcheck XML output to JUnit format.',
     long_description=open('README.rst').read(),
@@ -15,9 +15,11 @@
 
     py_modules=['cppcheck_junit'],
     install_requires=open('requirements.txt').readlines(),
+    python_requires='>=3.5',
     zip_safe=False,
 
     license='MIT',
+    license_files=['LICENSE.txt'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
@@ -26,8 +28,6 @@
         'Operating System :: OS Independent',
         'Programming Language :: C++',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

setup.py

@@ -1,13 +1,11 @@
 [tox]
-# Environment changes have to be manually synced with '.travis.yml'.
 envlist =
-    py27
     py35
     py36
     py37
     py38
-    pypy
     pypy3
+skip_missing_interpreters = true
 
 [flake8]
 max-line-length = 99
@@ -20,7 +18,7 @@ exclude =
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
-    -rrequirements-dev.txt
+    -rdev-requirements.txt
     codecov
 
 commands =