[Python-modules-commits] [libcloud] 04/06: Drop debian/patches/dont_req_backports_with_py3.patch, applied upstream.

[Andrew Starr-Bochicchio]

This is an automated email from the git hooks/post-receive script.

asb pushed a commit to branch master
in repository libcloud.

commit 903ffb3f7e89f47cd43519adb46c52608a7ff626
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Mon Jan 18 15:45:31 2016 -0500

    Drop debian/patches/dont_req_backports_with_py3.patch, applied upstream.
---
 debian/changelog                                 |   2 +
 debian/patches/dont_req_backports_with_py3.patch | 104 -----------------------
 debian/patches/series                            |   1 -
 3 files changed, 2 insertions(+), 105 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 157d66b..c31c52e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libcloud (0.20.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
    - Resolves test failures (Closes: #811160). 
+  * Drop debian/patches/dont_req_backports_with_py3.patch,
+    applied upstream.
 
  -- Andrew Starr-Bochicchio <asb at debian.org>  Mon, 18 Jan 2016 14:48:24 -0500
 
diff --git a/debian/patches/dont_req_backports_with_py3.patch b/debian/patches/dont_req_backports_with_py3.patch
deleted file mode 100644
index 4b2d1b4..0000000
--- a/debian/patches/dont_req_backports_with_py3.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 461538ae2da785d4cbdc50cc184c056344d21355 Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 09:32:34 -0700
-Subject: Don't require the backports.ssl_match_hostname module when
-
- running the tests under Python 3 as it is not needed.
-Bug: https://issues.apache.org/jira/browse/LIBCLOUD-644
-
-Patch-Name: dont_req_backports_with_py3.patch
----
- libcloud/httplib_ssl.py |  5 ++++-
- setup.py                | 19 +++++++++++--------
- tox.ini                 |  9 +++------
- 3 files changed, 18 insertions(+), 15 deletions(-)
-
-diff --git a/libcloud/httplib_ssl.py b/libcloud/httplib_ssl.py
-index 52d1ed1..66dff48 100644
---- a/libcloud/httplib_ssl.py
-+++ b/libcloud/httplib_ssl.py
-@@ -23,7 +23,10 @@ import ssl
- import base64
- import warnings
- 
--from backports.ssl_match_hostname import match_hostname, CertificateError
-+if sys.version_info >= (3, 2):
-+    from ssl import match_hostname, CertificateError
-+else:
-+    from backports.ssl_match_hostname import match_hostname, CertificateError
- 
- import libcloud.security
- from libcloud.utils.py3 import b
-diff --git a/setup.py b/setup.py
-index 63e9ce7..ec007a7 100644
---- a/setup.py
-+++ b/setup.py
-@@ -46,19 +46,20 @@ DOC_TEST_MODULES = ['libcloud.compute.drivers.dummy',
- 
- SUPPORTED_VERSIONS = ['2.5', '2.6', '2.7', 'PyPy', '3.x']
- 
--TEST_REQUIREMENTS = [
--    'backports.ssl_match_hostname',
--    'mock'
--]
--
- if sys.version_info <= (2, 4):
-     version = '.'.join([str(x) for x in sys.version_info[:3]])
-     print('Version ' + version + ' is not supported. Supported versions are ' +
-           ', '.join(SUPPORTED_VERSIONS))
-     sys.exit(1)
- 
--# pre-2.6 will need the ssl PyPI package
--pre_python26 = (sys.version_info[0] == 2 and sys.version_info[1] < 6)
-+pre_python26 = sys.version_info[:2] < (2, 6)
-+pre_python32 = sys.version_info[:2] < (3, 2)
-+
-+TEST_REQUIREMENTS = [
-+    'mock'
-+]
-+if pre_python32:
-+    TEST_REQUIREMENTS.extend(['backports.ssl_match_hostname'])
- 
- 
- def read_version_string():
-@@ -222,9 +223,11 @@ class CoverageCommand(Command):
- 
- forbid_publish()
- 
--install_requires = ['backports.ssl_match_hostname']
-+install_requires = []
- if pre_python26:
-     install_requires.extend(['ssl', 'simplejson'])
-+if pre_python32:
-+    install_requires.extend(['backports.ssl_match_hostname'])
- 
- setup(
-     name='apache-libcloud',
-diff --git a/tox.ini b/tox.ini
-index f13e909..6dd098b 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -29,20 +29,17 @@ deps = backports.ssl_match_hostname
-        lockfile
- 
- [testenv:py32]
--deps = backports.ssl_match_hostname
--       mock
-+deps = mock
-        lockfile
- 
- [testenv:py33]
--deps = backports.ssl_match_hostname
--       mock
-+deps = mock
-        lockfile
- 
- [testenv:py34]
- # At some point we can switch to use the stdlib provided mock module on
- # Python3.4+
--deps = backports.ssl_match_hostname
--       mock
-+deps = mock
-        lockfile
- 
- [testenv:docs]
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5081318..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dont_req_backports_with_py3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/libcloud.git