From 56fd2bc2187b33ec9268a770f523598bbf88a448ae01a1d0895fe362940cb522 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 11 Sep 2014 16:17:34 +0000 Subject: [PATCH] Accepting request 248643 from home:TheBlackCat:branches:devel:languages:python Update to version 1.9 OBS-URL: https://build.opensuse.org/request/show/248643 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=5 --- ...stall-dummyserver-into-site-packages.patch | 38 ------------- ...on-t-pin-dependency-to-exact-version.patch | 22 ++++---- python-urllib3.changes | 54 +++++++++++++++++++ python-urllib3.spec | 10 ++-- urllib3-1.8.tar.gz | 3 -- urllib3-1.9.tar.gz | 3 ++ urllib3-test-no-coverage.patch | 4 +- 7 files changed, 75 insertions(+), 59 deletions(-) delete mode 100644 0001-Don-t-install-dummyserver-into-site-packages.patch delete mode 100644 urllib3-1.8.tar.gz create mode 100644 urllib3-1.9.tar.gz diff --git a/0001-Don-t-install-dummyserver-into-site-packages.patch b/0001-Don-t-install-dummyserver-into-site-packages.patch deleted file mode 100644 index d0561ef..0000000 --- a/0001-Don-t-install-dummyserver-into-site-packages.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3361f884456699c67bf4eef2eeafb14a071cc509 Mon Sep 17 00:00:00 2001 -From: Sascha Peilicke -Date: Thu, 20 Mar 2014 15:41:39 +0100 -Subject: [PATCH] Don't install dummyserver into site-packages - -It is pure example code with self-signed certificates. It pollutes the -global site-packages spaces and is potentially dangerous (if used -accidentally). It doesn't make sense to install it as 'package_data' or -'date_files' either. Since it servers as an example it should be part -of the source distribution. ---- - MANIFEST.in | 1 + - setup.py | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/MANIFEST.in b/MANIFEST.in -index d1abae2..3f344d1 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -1 +1,2 @@ - include README.rst CHANGES.rst LICENSE.txt CONTRIBUTORS.txt test-requirements.txt -+recursive-include dummyserver *.* -diff --git a/setup.py b/setup.py -index 392b885..84e6d5f 100644 ---- a/setup.py -+++ b/setup.py -@@ -44,7 +44,7 @@ setup(name='urllib3', - author_email='andrey.petrov@shazow.net', - url='http://urllib3.readthedocs.org/', - license='MIT', -- packages=['urllib3', 'dummyserver', -+ packages=['urllib3', - 'urllib3.packages', 'urllib3.packages.ssl_match_hostname', - 'urllib3.contrib', - ], --- -1.9.0 - diff --git a/0001-Don-t-pin-dependency-to-exact-version.patch b/0001-Don-t-pin-dependency-to-exact-version.patch index 995e493..b6cc299 100644 --- a/0001-Don-t-pin-dependency-to-exact-version.patch +++ b/0001-Don-t-pin-dependency-to-exact-version.patch @@ -11,19 +11,21 @@ use '>='. test-requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/test-requirements.txt b/test-requirements.txt +diff --git a/dev-requirements.txt b/dev-requirements.txt index 02d70f4..98de1cc 100644 ---- a/test-requirements.txt -+++ b/test-requirements.txt -@@ -1,4 +1,4 @@ --nose==1.3 +--- a/dev-requirements.txt ++++ b/dev-requirements.txt +@@ -1,5 +1,5 @@ +-nose==1.3.3 -mock==1.0.1 --tornado==3.1.1 --coverage==3.6 -+nose>=1.3 +-tornado==3.2.2 +-coverage==3.7.1 +-tox==1.7.1 ++nose>=1.3.3 +mock>=1.0.1 -+tornado>=3.1.1 -+coverage>=3.6 ++tornado>=3.2.2 ++coverage>=3.7.1 ++tox>=1.7.1 -- 1.9.0 diff --git a/python-urllib3.changes b/python-urllib3.changes index 527802f..eadd514 100644 --- a/python-urllib3.changes +++ b/python-urllib3.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Thu Sep 11 12:38:13 UTC 2014 - toddrme2178@gmail.com + +- Remove upstreamed 0001-Don-t-install-dummyserver-into-site-packages.patch +- Rebase 0001-Don-t-pin-dependency-to-exact-version.patch and + urllib3-test-no-coverage.patch +- Update to version 1.9 (2014-07-04) + * Shuffled around development-related files. + If you're maintaining a distro package of urllib3, you may need + to tweak things. (Issue #415) + * Unverified HTTPS requests will trigger a warning on the first + request. See our new security documentation for details. + (Issue #426) + * New retry logic and urllib3.util.retry.Retry configuration + object. (Issue #326) + * All raised exceptions should now wrapped in a + urllib3.exceptions.HTTPException-extending exception. + (Issue #326) + * All errors during a retry-enabled request should be wrapped in + urllib3.exceptions.MaxRetryError, including timeout-related + exceptions which were previously exempt. Underlying error is + accessible from the .reason propery. (Issue #326) + * urllib3.exceptions.ConnectionError renamed to + urllib3.exceptions.ProtocolError. (Issue #326) + * Errors during response read (such as IncompleteRead) are now + wrapped in urllib3.exceptions.ProtocolError. (Issue #418) + * Requesting an empty host will raise + urllib3.exceptions.LocationValueError. (Issue #417) + * Catch read timeouts over SSL connections as + urllib3.exceptions.ReadTimeoutError. (Issue #419) + * Apply socket arguments before connecting. (Issue #427) +- Update to version 1.8.3 (2014-06-23) + * Fix TLS verification when using a proxy in Python 3.4.1. + (Issue #385) + * Add disable_cache option to urllib3.util.make_headers. + (Issue #393) + * Wrap socket.timeout exception with + urllib3.exceptions.ReadTimeoutError. (Issue #399) + * Fixed proxy-related bug where connections were being reused + incorrectly. (Issues #366, #369) + * Added socket_options keyword parameter which allows to define + setsockopt configuration of new sockets. (Issue #397) + * Removed HTTPConnection.tcp_nodelay in favor of + HTTPConnection.default_socket_options. (Issue #397) + * Fixed TypeError bug in Python 2.6.4. (Issue #411) +- Update to version 1.8.2 (2014-04-17) + * Fix urllib3.util not being included in the package. +- Update to version 1.8.1 (2014-04-17) + * Fix AppEngine bug of HTTPS requests going out as HTTP. + (Issue #356) + * Don't install dummyserver into site-packages as it's only + needed for the test suite. (Issue #362) + * Added support for specifying source_address. (Issue #352) + ------------------------------------------------------------------- Thu Mar 20 15:18:55 UTC 2014 - speilicke@suse.com diff --git a/python-urllib3.spec b/python-urllib3.spec index 6fd4251..7881f95 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -17,7 +17,7 @@ Name: python-urllib3 -Version: 1.8 +Version: 1.9 Release: 0 Summary: HTTP library with thread-safe connection pooling, file post, and more License: MIT @@ -26,10 +26,8 @@ Url: http://urllib3.readthedocs.org/ Source: https://pypi.python.org/packages/source/u/urllib3/urllib3-%{version}.tar.gz # PATCH-FIX-UPSTREAM speilicke@suse.com -- https://github.com/shazow/urllib3/pull/361 Patch0: 0001-Don-t-pin-dependency-to-exact-version.patch -# PATCH-FIX-UPSTREAM speilicke@suse.com -- https://github.com/shazow/urllib3/pull/362 -Patch1: 0001-Don-t-install-dummyserver-into-site-packages.patch # PATCH-FIX-OPENSUSE speilicke@suse.com -- We need no coverage report -Patch2: urllib3-test-no-coverage.patch +Patch1: urllib3-test-no-coverage.patch BuildRequires: python-devel # Test requirements: BuildRequires: python-mock >= 1.0.1 @@ -62,7 +60,6 @@ Highlights %setup -q -n urllib3-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -71,7 +68,8 @@ python setup.py build python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check -nosetests +rm -rf build +PYTHONPATH="%{buildroot}%{python_sitelib}" nosetests -I test_util.py %files %defattr(-,root,root,-) diff --git a/urllib3-1.8.tar.gz b/urllib3-1.8.tar.gz deleted file mode 100644 index ebddcd3..0000000 --- a/urllib3-1.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a89fa1b43d277cfadf228cc90b9c75f254818ea3a1aab7bffb0223cbb7bb15d -size 76503 diff --git a/urllib3-1.9.tar.gz b/urllib3-1.9.tar.gz new file mode 100644 index 0000000..fc1f241 --- /dev/null +++ b/urllib3-1.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e400b2e2f53652dd0d8062ca5ecc425b6af6e96989b8d31f5dd875186aa247b +size 91865 diff --git a/urllib3-test-no-coverage.patch b/urllib3-test-no-coverage.patch index e1e3bca..4a36e21 100644 --- a/urllib3-test-no-coverage.patch +++ b/urllib3-test-no-coverage.patch @@ -9,5 +9,5 @@ diff -ruN a/setup.cfg b/setup.cfg -cover-min-percentage = 100 -cover-erase = true - [egg_info] - tag_build = + [flake8] + max-line-length = 99