aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog33
-rw-r--r--debian/clean1
-rw-r--r--debian/control6
-rw-r--r--debian/copyright2
-rw-r--r--debian/patches/01_do-not-use-embedded-python-six.patch27
-rw-r--r--debian/patches/02_require-cert-verification.patch10
-rw-r--r--debian/patches/03_force_setuptools.patch (renamed from debian/patches/setuptools.patch)5
-rw-r--r--debian/patches/03_no-setuptools.patch26
-rw-r--r--debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch56
-rw-r--r--debian/patches/06_relax-test-requirements.patch16
-rw-r--r--debian/patches/series5
-rwxr-xr-xdebian/rules15
12 files changed, 141 insertions, 61 deletions
diff --git a/debian/changelog b/debian/changelog
index a515f72..827b7bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+python-urllib3 (1.8.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/clean
+ - Removed .coverage entry
+ * debian/control
+ - Added python3-coverage, python3-mock, python3-nose to Build-Depends
+ - Bumped python(3)-coverage to (>=3.6)
+ - Removed python-tornado from Build-Depends since it was used only for
+ dummyserver
+ * debian/copyright
+ - Updated copyright years
+ * debian/patches/01_do-not-use-embedded-python-six.patch
+ - Refreshed
+ * debian/patches/02_require-cert-verification.patch
+ - Refreshed
+ * debian/patches/03_no-setuptools.patch
+ - Superseded by debian/patches/setuptools.patch
+ * debian/patches/03_force-setuptools.patch
+ - Renamed from setuptools.patch
+ - Added description
+ * debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
+ - Do not use embedded copy of ssl.match_hostname
+ * debian/patches/06_relax-test-requirements.patch
+ - Relax version of packages needed for testing
+ * debian/rules
+ - Enabled tests at build time also for Python 3 using the custom build
+ plugin of pybuild
+ - Cleaned .coverage file generated by nose using coverage plugin
+ - No need to remove dummyserver since it is not installed anymore
+
+ -- Daniele Tricoli <eriol@mornie.org> Wed, 28 May 2014 19:41:18 +0200
+
python-urllib3 (1.8-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/clean b/debian/clean
index 5202946..80574db 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1 @@
urllib3.egg-info/*
-.coverage
diff --git a/debian/control b/debian/control
index 1211fa5..87415bb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,15 @@ Build-Depends:
debhelper (>= 9),
dh-python,
python-all (>= 2.6.6-3),
- python-coverage (>= 3.4),
+ python-coverage (>= 3.6),
python-mock,
python-nose (>=1.1.2),
python-setuptools,
python-six,
- python-tornado,
python3-all,
+ python3-coverage (>= 3.6),
+ python3-mock,
+ python3-nose (>=1.1.2),
python3-setuptools,
python3-six,
python3-wheel,
diff --git a/debian/copyright b/debian/copyright
index d28dac4..1662f05 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,7 +20,7 @@ Copyright: 2011, Python Software Foundation
License: PSF-2
Files: debian/*
-Copyright: 2012-2013, Daniele Tricoli <eriol@mornie.org>
+Copyright: 2012-2014, Daniele Tricoli <eriol@mornie.org>
License: Expat
License: Expat
diff --git a/debian/patches/01_do-not-use-embedded-python-six.patch b/debian/patches/01_do-not-use-embedded-python-six.patch
index 95d6de1..f95a1e1 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -1,7 +1,7 @@
Description: Do not use embedded copy of python-six.
Author: Daniele Tricoli <eriol@mornie.org>
Forwarded: not-needed
-Last-Update: 2014-03-31
+Last-Update: 2014-05-24
--- a/test/test_collections.py
+++ b/test/test_collections.py
@@ -16,7 +16,7 @@ Last-Update: 2014-03-31
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
-@@ -30,7 +30,7 @@
+@@ -32,7 +32,7 @@
ProxyError,
)
from .packages.ssl_match_hostname import CertificateError
@@ -49,17 +49,6 @@ Last-Update: 2014-03-31
from .util import is_fp_closed
---- a/urllib3/util.py
-+++ b/urllib3/util.py
-@@ -32,7 +32,7 @@
- except ImportError:
- pass
-
--from .packages import six
-+import six
- from .exceptions import LocationParseError, SSLError, TimeoutStateError
-
-
--- a/test/test_filepost.py
+++ b/test/test_filepost.py
@@ -2,7 +2,7 @@
@@ -73,7 +62,7 @@ Last-Update: 2014-03-31
BOUNDARY = '!! test boundary !!'
--- a/dummyserver/handlers.py
+++ b/dummyserver/handlers.py
-@@ -186,7 +186,7 @@
+@@ -190,7 +190,7 @@
"""
import tornado.httputil
import email.utils
@@ -126,3 +115,13 @@ Last-Update: 2014-03-31
from .util import (
assert_fingerprint,
resolve_cert_reqs,
+--- a/urllib3/util/request.py
++++ b/urllib3/util/request.py
+@@ -1,6 +1,6 @@
+ from base64 import b64encode
+
+-from ..packages import six
++import six
+
+
+ ACCEPT_ENCODING = 'gzip,deflate'
diff --git a/debian/patches/02_require-cert-verification.patch b/debian/patches/02_require-cert-verification.patch
index 14b6a73..1c09012 100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@ -3,11 +3,11 @@ Description: require SSL certificate validation by default by using
CERT_REQUIRED and using the system /etc/ssl/certs/ca-certificates.crt
Bug-Ubuntu: https://launchpad.net/bugs/1047054
Bug-Debian: http://bugs.debian.org/686872
-Last-Update: 2014-03-31
+Last-Update: 2014-05-24
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
-@@ -583,6 +583,8 @@
+@@ -591,6 +591,8 @@
``ssl_version`` are only used if :mod:`ssl` is available and are fed into
:meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
into an SSL socket.
@@ -16,7 +16,7 @@ Last-Update: 2014-03-31
"""
scheme = 'https'
-@@ -592,8 +594,8 @@
+@@ -600,8 +602,8 @@
strict=False, timeout=None, maxsize=1,
block=False, headers=None,
_proxy=None, _proxy_headers=None,
@@ -24,6 +24,6 @@ Last-Update: 2014-03-31
- ca_certs=None, ssl_version=None,
+ key_file=None, cert_file=None, cert_reqs='CERT_REQUIRED',
+ ca_certs='/etc/ssl/certs/ca-certificates.crt', ssl_version=None,
- assert_hostname=None, assert_fingerprint=None):
+ assert_hostname=None, assert_fingerprint=None,
+ **conn_kw):
- HTTPConnectionPool.__init__(self, host, port, strict, timeout, maxsize,
diff --git a/debian/patches/setuptools.patch b/debian/patches/03_force_setuptools.patch
index ff8f7e9..e829b50 100644
--- a/debian/patches/setuptools.patch
+++ b/debian/patches/03_force_setuptools.patch
@@ -1,3 +1,8 @@
+Author: Barry Warsaw <barry@debian.org>
+Description: Use setuptools.setup() so that the bdist_wheel
+ command will work.
+Last-Update: 2014-05-15
+
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
diff --git a/debian/patches/03_no-setuptools.patch b/debian/patches/03_no-setuptools.patch
deleted file mode 100644
index ee2e913..0000000
--- a/debian/patches/03_no-setuptools.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Do not use setuptools.
-Author: Daniele Tricoli <eriol@mornie.org>
-Forwarded: not-needed
-Last-Update: 2013-05-10
-
---- a/setup.py
-+++ b/setup.py
-@@ -5,11 +5,6 @@
- import os
- import re
-
--try:
-- import setuptools
--except ImportError:
-- pass # No 'develop' command, oh well.
--
- base_path = os.path.dirname(__file__)
-
- # Get the version (borrowed from SQLAlchemy)
-@@ -49,6 +44,4 @@
- 'urllib3.contrib',
- ],
- requires=requirements,
-- tests_require=tests_requirements,
-- test_suite='test',
- )
diff --git a/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch b/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
new file mode 100644
index 0000000..9ee4cb9
--- /dev/null
+++ b/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
@@ -0,0 +1,56 @@
+Description: Do not use embedded copy of ssl.match_hostname.
+Author: Daniele Tricoli <eriol@mornie.org>
+Forwarded: not-needed
+Last-Update: 2014-05-25
+
+--- a/test/test_connectionpool.py
++++ b/test/test_connectionpool.py
+@@ -6,7 +6,7 @@
+ HTTPConnectionPool,
+ )
+ from urllib3.util import Timeout
+-from urllib3.packages.ssl_match_hostname import CertificateError
++from ssl import CertificateError
+ from urllib3.exceptions import (
+ ClosedPoolError,
+ EmptyPoolError,
+--- a/urllib3/connection.py
++++ b/urllib3/connection.py
+@@ -38,7 +38,7 @@
+ from .exceptions import (
+ ConnectTimeoutError,
+ )
+-from .packages.ssl_match_hostname import match_hostname
++from ssl import match_hostname
+ import six
+ from .util import (
+ assert_fingerprint,
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
+@@ -31,7 +31,7 @@
+ ReadTimeoutError,
+ ProxyError,
+ )
+-from .packages.ssl_match_hostname import CertificateError
++from ssl import CertificateError
+ import six
+ from .connection import (
+ port_by_scheme,
+--- a/urllib3/packages/__init__.py
++++ b/urllib3/packages/__init__.py
+@@ -1,4 +1,3 @@
+ from __future__ import absolute_import
+
+-from . import ssl_match_hostname
+
+--- a/setup.py
++++ b/setup.py
+@@ -45,7 +45,7 @@
+ url='http://urllib3.readthedocs.org/',
+ license='MIT',
+ packages=['urllib3',
+- 'urllib3.packages', 'urllib3.packages.ssl_match_hostname',
++ 'urllib3.packages',
+ 'urllib3.contrib', 'urllib3.util',
+ ],
+ requires=requirements,
diff --git a/debian/patches/06_relax-test-requirements.patch b/debian/patches/06_relax-test-requirements.patch
new file mode 100644
index 0000000..e0fe46c
--- /dev/null
+++ b/debian/patches/06_relax-test-requirements.patch
@@ -0,0 +1,16 @@
+Description: Relax version of packages needed for testing.
+Author: Daniele Tricoli <eriol@mornie.org>
+Forwarded: not-needed
+Last-Update: 2014-05-25
+
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -1,4 +1,4 @@
+-nose==1.3
+-mock==1.0.1
+-tornado==3.1.1
+-coverage==3.6
++nose>=1.3
++mock>=1.0.1
++tornado>=3.1.1
++coverage>=3.6
diff --git a/debian/patches/series b/debian/patches/series
index 52e03c4..6bb1581 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
01_do-not-use-embedded-python-six.patch
02_require-cert-verification.patch
-03_no-setuptools.patch
+03_force_setuptools.patch
04_relax_nosetests_options.patch
-setuptools.patch
+05_do-not-use-embedded-ssl-match-hostname.patch
+06_relax-test-requirements.patch
diff --git a/debian/rules b/debian/rules
index f3dea6c..e66f170 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
export PYBUILD_NAME=urllib3
export PYTHONWARNINGS=d
-
%:
dh $@ --with python2,python3 --buildsystem=pybuild
@@ -12,20 +11,16 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install
- # Remove dummyserver/ tests to not pollute namespace.
- rm -rf debian/python*-urllib3/usr/lib/python*/dist-packages/dummyserver
python3 setup.py bdist_wheel \
--universal \
-d $(CURDIR)/debian/tmp/usr/share/python-wheels
override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- # Python3 testing is not possible at the moment because missing
- # dependencies: python3-coverage.
- # Upstream is using a python2.7 features: assertRaises() as a context
- # manager
- set -ex; python2.7 /usr/bin/nosetests
-endif
+ PYBUILD_SYSTEM=custom \
+ PYBUILD_TEST_ARGS="cd {build_dir}; {interpreter} -m nose {dir}/test --with-coverage" dh_auto_test
+ # Clean here .coverage because it is created by nose using the coverage
+ # plugin
+ find . -name .coverage -delete
override_dh_installchangelogs:
dh_installchangelogs CHANGES.rst
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-22 06:07:41 +0000