Hello community,
here is the log from the commit of package python-cinderclient for
openSUSE:Factory checked in at 2013-03-08 09:39:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cinderclient (Old)
and /work/SRC/openSUSE:Factory/.python-cinderclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cinderclient", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cinderclient/python-cinderclient.changes
2013-01-17 09:57:37.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python-cinderclient.new/python-cinderclient.changes
2013-03-08 09:39:46.000000000 +0100
@@ -0,0 +1,6 @@
+-------------------------------------------------------------------
+Wed Mar 6 15:06:33 UTC 2013 - [email protected]
+
+- Add compat-newer-requests.patch: take patches from upstream to
+ allow working with newer versions of python-requests.
+
New:
----
compat-newer-requests.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cinderclient.spec ++++++
--- /var/tmp/diff_new_pack.cKKk6e/_old 2013-03-08 09:39:47.000000000 +0100
+++ /var/tmp/diff_new_pack.cKKk6e/_new 2013-03-08 09:39:47.000000000 +0100
@@ -26,6 +26,8 @@
Url: http://launchpad.net/python-cinderclient
Group: Development/Languages/Python
Source: python-cinderclient-master.tar.gz
+# PATCH-FIX-UPSTREAM compat-newer-requests.patch [email protected] -- Add patches
from git to work with more recent versions of python-requests
+Patch0: compat-newer-requests.patch
BuildRequires: openstack-macros
BuildRequires: python-base
BuildRequires: python-distribute
@@ -74,6 +76,7 @@
%setup -q -n python-cinderclient-1.0.1.5.g82e47d0
%openstack_cleanup_prep
echo %{version} > cinderclient/versioninfo
+%patch0 -p1
%build
python setup.py build
++++++ compat-newer-requests.patch ++++++
Patch slightly tweaked to apply to tarball.
commit 8d43cd9c016a364867bde7fa1d351081f1820905
Author: Chuck Short <[email protected]>
Date: Tue Feb 5 09:45:46 2013 -0600
Allow requests 0.8 and greater
Bump up version requirements for requests to standardize
on version >= 0.8 so it doesnt create conflict with other
openstack projects.
Change-Id: I1ed9b3bd6bdbbbb451298a3c397e6e7a06c0cabd
Signed-off-by: Chuck Short <[email protected]>
diff --git a/cinderclient/client.py b/cinderclient/client.py
index c4dbdd9..d0f75d7 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -37,10 +37,6 @@ class HTTPClient(object):
USER_AGENT = 'python-cinderclient'
- requests_config = {
- 'danger_mode': False,
- }
-
def __init__(self, user, password, projectid, auth_url, insecure=False,
timeout=None, tenant_id=None, proxy_tenant_id=None,
proxy_token=None, region_name=None,
@@ -79,7 +75,8 @@ class HTTPClient(object):
ch = logging.StreamHandler()
self._logger.setLevel(logging.DEBUG)
self._logger.addHandler(ch)
- self.requests_config['verbose'] = sys.stderr
+ if hasattr(requests, logging):
+ requests.logging.getLogger(requests.__name__).addHandler(ch)
def http_log_req(self, args, kwargs):
if not self.http_log_debug:
@@ -123,7 +120,6 @@ class HTTPClient(object):
method,
url,
verify=self.verify_cert,
- config=self.requests_config,
**kwargs)
self.http_log_resp(resp)
diff --git a/tests/utils.py b/tests/utils.py
index 9da5f1a..3a12923 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -5,7 +5,6 @@ import testtools
class TestCase(unittest2.TestCase):
TEST_REQUEST_BASE = {
- 'config': {'danger_mode': False},
'verify': True,
}
diff --git a/tools/pip-requires b/tools/pip-requires
index fab4830..e708630 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,4 +1,4 @@
argparse
prettytable
-requests<1.0
+requests>=0.8
simplejson
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
