From fcee04a79ce38aaad1cfe3cb0bf4d2b3d4cf6ceea788ba633a692e4cd206f994 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Fri, 25 Sep 2015 11:47:24 +0000
Subject: [PATCH] Accepting request 333732 from
home:posophe:branches:devel:languages:python
update
OBS-URL: https://build.opensuse.org/request/show/333732
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=7
---
...on-t-pin-dependency-to-exact-version.patch | 24 ++++++++++++-------
python-urllib3.changes | 19 +++++++++++++++
python-urllib3.spec | 22 ++++++++++-------
urllib3-1.12.tar.gz | 3 +++
urllib3-1.9.tar.gz | 3 ---
5 files changed, 51 insertions(+), 20 deletions(-)
create mode 100644 urllib3-1.12.tar.gz
delete mode 100644 urllib3-1.9.tar.gz
diff --git a/0001-Don-t-pin-dependency-to-exact-version.patch b/0001-Don-t-pin-dependency-to-exact-version.patch
index b6cc299..d7b2d8f 100644
--- a/0001-Don-t-pin-dependency-to-exact-version.patch
+++ b/0001-Don-t-pin-dependency-to-exact-version.patch
@@ -15,17 +15,23 @@ diff --git a/dev-requirements.txt b/dev-requirements.txt
index 02d70f4..98de1cc 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
-@@ -1,5 +1,5 @@
--nose==1.3.3
--mock==1.0.1
--tornado==3.2.2
+@@ -1,8 +1,8 @@
+-nose==1.3.7
+-nose-exclude==0.4.1
+-mock==1.3.0
-coverage==3.7.1
--tox==1.7.1
-+nose>=1.3.3
-+mock>=1.0.1
-+tornado>=3.2.2
+-tox==2.1.1
+-twine==1.5.0
+-wheel==0.24.0
+-tornado==4.2.1
++nose>=1.3.7
++nose-exclude>=0.4.1
++mock>=1.3.0
+coverage>=3.7.1
-+tox>=1.7.1
++tox>=2.1.1
++twine>=1.5.0
++wheel>=0.24.0
++tornado>=4.2.1
--
1.9.0
diff --git a/python-urllib3.changes b/python-urllib3.changes
index eadd514..dc853e8 100644
--- a/python-urllib3.changes
+++ b/python-urllib3.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Sep 25 11:24:49 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 1.12
+ * Rely on six for importing httplib to work around conflicts with
+ other Python 3 shims. (Issue #688)
+ * Add support for directories of certificate authorities, as
+ supported by OpenSSL. (Issue #701)
+ * New exception: NewConnectionError, raised when we fail to
+ establish a new connection, usually ECONNREFUSED socket error.
+- Fix version dependencies
+- Add new build requirements following upstream changes
+ * python-nose-exclude
+ * python-tox
+ * python-twine
+ * python-wheel
+- Update 0001-Don-t-pin-dependency-to-exact-version.patch
+- Disable tests for now, as there require network
+
-------------------------------------------------------------------
Thu Sep 11 12:38:13 UTC 2014 - toddrme2178@gmail.com
diff --git a/python-urllib3.spec b/python-urllib3.spec
index 7881f95..d2eddcc 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-urllib3
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: python-urllib3
-Version: 1.9
+Version: 1.12
Release: 0
Summary: HTTP library with thread-safe connection pooling, file post, and more
License: MIT
@@ -28,11 +28,16 @@ Source: https://pypi.python.org/packages/source/u/urllib3/urllib3-%{vers
Patch0: 0001-Don-t-pin-dependency-to-exact-version.patch
# PATCH-FIX-OPENSUSE speilicke@suse.com -- We need no coverage report
Patch1: urllib3-test-no-coverage.patch
+BuildRequires: python-certifi
BuildRequires: python-devel
# Test requirements:
-BuildRequires: python-mock >= 1.0.1
-BuildRequires: python-nose >= 1.3
-BuildRequires: python-tornado >= 3.1.1
+BuildRequires: python-mock >= 1.3.0
+BuildRequires: python-nose >= 1.3.7
+BuildRequires: python-nose-exclude >= 0.4.1
+BuildRequires: python-tornado >= 4.2.1
+BuildRequires: python-tox >= 2.1.1
+BuildRequires: python-twine >= 1.5.0
+BuildRequires: python-wheel >= 0.24.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -67,9 +72,10 @@ python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-%check
-rm -rf build
-PYTHONPATH="%{buildroot}%{python_sitelib}" nosetests -I test_util.py
+# Tests require network
+#%check
+#rm -rf build
+#PYTHONPATH="%{buildroot}%{python_sitelib}" nosetests -I test_util.py
%files
%defattr(-,root,root,-)
diff --git a/urllib3-1.12.tar.gz b/urllib3-1.12.tar.gz
new file mode 100644
index 0000000..a214160
--- /dev/null
+++ b/urllib3-1.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ea512776971fe4e76192600fe41e4e7ee96b4b9a5b15aefc1ac31d2a63872c6
+size 151072
diff --git a/urllib3-1.9.tar.gz b/urllib3-1.9.tar.gz
deleted file mode 100644
index fc1f241..0000000
--- a/urllib3-1.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e400b2e2f53652dd0d8062ca5ecc425b6af6e96989b8d31f5dd875186aa247b
-size 91865