summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott K Logan <logans@cottsay.net>2015-08-25 22:07:25 -0700
committerScott K Logan <logans@cottsay.net>2015-08-25 22:07:25 -0700
commitc2469308fea5d746b797e6e15720ef5a2d0f6ad1 (patch)
tree1347b8b79d4d07b49ecaf40c0619d4016f709614
parenteef4b840354dbca43c471622ebbac4abf96cdef5 (diff)
downloadpython-jenkins-c2469308fea5d746b797e6e15720ef5a2d0f6ad1.tar.gz
python-jenkins-c2469308fea5d746b797e6e15720ef5a2d0f6ad1.tar.xz
python-jenkins-c2469308fea5d746b797e6e15720ef5a2d0f6ad1.zip
Update to 0.4.8
-rw-r--r--.gitignore1
-rw-r--r--python-jenkins-0.4.8-six-1.3.patch (renamed from python-jenkins-0.4.7-six-1.3.patch)23
-rw-r--r--python-jenkins.spec7
-rw-r--r--sources2
4 files changed, 17 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index 3c1aef4..cf2799e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/python-jenkins-0.4.1.tar.gz
/python-jenkins-0.4.5.tar.gz
/python-jenkins-0.4.7.tar.gz
+/python-jenkins-0.4.8.tar.gz
diff --git a/python-jenkins-0.4.7-six-1.3.patch b/python-jenkins-0.4.8-six-1.3.patch
index 4a1aa8d..799db0a 100644
--- a/python-jenkins-0.4.7-six-1.3.patch
+++ b/python-jenkins-0.4.8-six-1.3.patch
@@ -8,19 +8,16 @@ directly importing the various modules we need from six.moves.
Change-Id: I60a5f4be7e17b60f58927b162236d89d4a504135
---
- jenkins/__init__.py | 16 +++++++++++-----
- tests/test_jenkins.py | 6 +++++-
- 2 files changed, 16 insertions(+), 6 deletions(-)
+ jenkins/__init__.py | 20 +++++++++++++-------
+ tests/test_jenkins.py | 12 +++++++++---
+ 2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/jenkins/__init__.py b/jenkins/__init__.py
index 829f726..aa56b62 100644
--- a/jenkins/__init__.py
+++ b/jenkins/__init__.py
-@@ -49,13 +49,20 @@ import re
- import json
- import re
- import socket
-+import sys
+@@ -53,11 +53,17 @@
+ import warnings
import six
-from six.moves.http_client import BadStatusLine
@@ -40,9 +37,9 @@ index 829f726..aa56b62 100644
+ from urllib import quote, urlencode
+ from urllib2 import HTTPError, URLError, Request, urlopen
- LAUNCHER_SSH = 'hudson.plugins.sshslaves.SSHLauncher'
- LAUNCHER_COMMAND = 'hudson.slaves.CommandLauncher'
-@@ -416,10 +416,10 @@
+ if sys.version_info < (2, 7, 0):
+ warnings.warn("Support for python 2.6 is deprecated and will be removed.")
+@@ -449,10 +455,10 @@
"Error communicating with server[%s]: "
"empty response" % self.server)
@@ -73,9 +70,9 @@ index b59f798..ecb00cf 100644
+ from urllib2 import HTTPError
+ from urllib2 import build_opener
- from tests.helper import jenkins
+ import jenkins
-@@ -688,10 +688,10 @@
+@@ -699,10 +704,10 @@
j = jenkins.Jenkins('http://example.com/', 'test', 'test')
mock_response = Mock()
diff --git a/python-jenkins.spec b/python-jenkins.spec
index a823cc9..f7e5290 100644
--- a/python-jenkins.spec
+++ b/python-jenkins.spec
@@ -3,7 +3,7 @@
%endif
Name: python-jenkins
-Version: 0.4.7
+Version: 0.4.8
Release: 1%{?dist}
Summary: Python bindings for the remote Jenkins API
@@ -11,7 +11,7 @@ Group: Development/Libraries
License: BSD
URL: http://python-jenkins.readthedocs.org/en/latest
Source0: https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-Patch0: %{name}-0.4.7-six-1.3.patch
+Patch0: %{name}-0.4.8-six-1.3.patch
BuildArch: noarch
@@ -134,6 +134,9 @@ popd
%endif
%changelog
+* Tue Aug 25 2015 Scott K Logan <logans@cottsay.net> - 0.4.8-1
+- Update to 0.4.8
+
* Tue Jun 30 2015 Scott K Logan <logans@cottsay.net> - 0.4.7-1
- Update to 0.4.7
diff --git a/sources b/sources
index ceff5b9..fe93d37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f16638c8b0aa3a0d6343bdce854ca6e python-jenkins-0.4.7.tar.gz
+cf0096387fbe58be1ce93d1455cfa98d python-jenkins-0.4.8.tar.gz