Merge "Fix tests on python 2.6 and mark as deprecated"

jenkins/__init__.py

@@ -49,6 +49,8 @@ import base64
 import json
 import re
 import socket
+import sys
+import warnings
 
 import six
 from six.moves.http_client import BadStatusLine
@@ -57,6 +59,10 @@ from six.moves.urllib.error import URLError
 from six.moves.urllib.parse import quote, urlencode
 from six.moves.urllib.request import Request, urlopen
 
+if sys.version_info < (2, 7, 0):
+    warnings.warn("Support for python 2.6 is deprecated and will be removed.")
+
+
 LAUNCHER_SSH = 'hudson.plugins.sshslaves.SSHLauncher'
 LAUNCHER_COMMAND = 'hudson.slaves.CommandLauncher'
 LAUNCHER_JNLP = 'hudson.slaves.JNLPLauncher'

test-requirements.txt

@@ -1,7 +1,7 @@
 coverage>=3.6
 discover
 hacking>=0.5.6,<0.11
-mock
+mock<1.1
 unittest2
 python-subunit
 sphinx>=1.1.2,<1.2

tox.ini

@@ -17,11 +17,6 @@ commands =
     coverage report --omit="tests/*" --show-missing
     coverage html --omit="tests/*" -d cover
 
-[testenv:py26]
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       unittest2
-
 [tox:jenkins]
 downloadcache = ~/cache/pip