diff --git a/jenkins/__init__.py b/jenkins/__init__.py index aa5ffce..58afac3 100644 --- a/jenkins/__init__.py +++ b/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' diff --git a/test-requirements.txt b/test-requirements.txt index c4df181..a4e1693 100644 --- a/test-requirements.txt +++ b/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 diff --git a/tox.ini b/tox.ini index 0f23aa3..9e6eb3c 100644 --- a/tox.ini +++ b/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