Merge pull request #121 from xmlrunner/2.x

💥 DROP python 2.6 support - Bump version to 2.0.0-alpha

Author: dnozay

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 language: python
 
 python:
-  - "2.6"
   - "2.7"
   - "pypy"
   - "3.3"

Makefile

@@ -1,4 +1,8 @@
 
+build/tox/bin:
+	virtualenv build/tox
+	build/tox/bin/pip install tox
+
 build/publish/bin:
 	virtualenv build/publish
 	build/publish/bin/pip install wheel twine
@@ -14,7 +18,10 @@ dist: checkversion build/publish/bin
 publish: dist/ build/publish/bin
 	build/publish/bin/twine upload dist/*
 
+test: build/tox/bin
+	build/tox/bin/tox
+
 clean:
 	rm -rf build/ dist/
 
-.PHONY: checkversion dist publish clean
+.PHONY: checkversion dist publish clean test

README.md

@@ -18,7 +18,7 @@ systems, IDEs and continuous integration servers.
 ## Requirements
 
 * Python 2.7+ or 3.3+
-* Please note Python 2.6 end-of-life was in Oct 2013, and support will be dropped in next major version.
+* Please note Python 2.6 end-of-life was in Oct 2013, last version supporting 2.6 was 1.14.0
 
 ## Installation
 

setup.py

@@ -15,7 +15,7 @@
 # this is for sdist to work.
 import sys
 if sys.version_info < (2, 7):
-    install_requires += ['unittest2']
+    raise RuntimeError('This version requires Python 2.7+')
 
 setup(
     name = 'unittest-xml-reporting',
@@ -45,9 +45,5 @@
     zip_safe = False,
     include_package_data = True,
     install_requires = install_requires,
-    extras_require={
-        # this is for wheels to work
-        ':python_version=="2.6"': ['unittest2'],
-    },
     test_suite = 'tests'
 )

tox.ini

@@ -1,8 +1,7 @@
 [tox]
-envlist = begin,py{26,27,py,33,34},py27-django{lts,curr},end,quality
+envlist = begin,py{27,py,33,34},py27-django{lts,curr},end,quality
 
 [tox:travis]
-2.6 = py26
 2.7 = begin,py27,py27-django{lts,prev,curr},end,quality
 3.3 = py33
 3.4 = py34

xmlrunner/unittest.py

@@ -2,25 +2,17 @@
 from __future__ import absolute_import
 
 import sys
-if sys.version_info < (2, 7):
-    # pylint: disable-msg=W0611
-    import unittest2 as unittest
-    from unittest2.runner import TextTestRunner
-    from unittest2.runner import TextTestResult as _TextTestResult
-    from unittest2.result import TestResult, failfast
-    from unittest2.main import TestProgram
-else:
-    # pylint: disable-msg=W0611
-    import unittest
-    from unittest import TextTestRunner
-    from unittest import TestResult, _TextTestResult
-    from unittest.result import failfast
-    from unittest.main import TestProgram
-    try:
-        from unittest.main import USAGE_AS_MAIN
-        TestProgram.USAGE = USAGE_AS_MAIN
-    except ImportError:
-        pass
+# pylint: disable-msg=W0611
+import unittest
+from unittest import TextTestRunner
+from unittest import TestResult, _TextTestResult
+from unittest.result import failfast
+from unittest.main import TestProgram
+try:
+    from unittest.main import USAGE_AS_MAIN
+    TestProgram.USAGE = USAGE_AS_MAIN
+except ImportError:
+    pass
 
 __all__ = (
     'unittest', 'TextTestRunner', 'TestResult', '_TextTestResult',

xmlrunner/version.py

@@ -1,2 +1,2 @@
 
-__version__ = '1.14.0'
+__version__ = '2.0.0-alpha'