jjb/python-jenkins
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-07-13 22:10:46 +00:00 committed by Gerrit Code Review
commit c83e9b1dc1
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/__init__.py
View File

@ -49,6 +49,8 @@ import base64
import json import json
import re import re
import socket import socket
import sys
import warnings
import six import six
from six.moves.http_client import BadStatusLine 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.parse import quote, urlencode
from six.moves.urllib.request import Request, urlopen 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_SSH = 'hudson.plugins.sshslaves.SSHLauncher'
LAUNCHER_COMMAND = 'hudson.slaves.CommandLauncher' LAUNCHER_COMMAND = 'hudson.slaves.CommandLauncher'
LAUNCHER_JNLP = 'hudson.slaves.JNLPLauncher' LAUNCHER_JNLP = 'hudson.slaves.JNLPLauncher'

2
test-requirements.txt
View File

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

5
tox.ini
View File

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