diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/01_use-system-ca-certificates.patch | 6 | ||||
| -rw-r--r-- | debian/patches/02_use-system-chardet-and-urllib3.patch | 9 | ||||
| -rwxr-xr-x | debian/rules | 15 |
5 files changed, 34 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index eb3e611..9cad6ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +requests (2.3.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * d/control: Added python{,3}-pytest to Build-Depends. + * d/patches/*: Refreshed. + + -- Barry Warsaw <barry@debian.org> Wed, 04 Jun 2014 10:40:46 -0400 + requests (2.2.1-3) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index fcadaf1..80eef11 100644 --- a/debian/control +++ b/debian/control @@ -7,10 +7,12 @@ Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3), python-chardet, + python-pytest, python-setuptools, python-urllib3 (>= 1.7.1), python3-all, python3-chardet, + python3-pytest, python3-setuptools, python3-urllib3 (>= 1.7.1), python3-wheel diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch index f079c99..6f18dcb 100644 --- a/debian/patches/01_use-system-ca-certificates.patch +++ b/debian/patches/01_use-system-ca-certificates.patch @@ -4,8 +4,8 @@ Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed Last-Update: 2013-01-19 ---- a/requests/certs.py 2013-04-25 22:54:02.000000000 +0000 -+++ b/requests/certs.py 2013-04-25 22:54:34.000000000 +0000 +--- a/requests/certs.py ++++ b/requests/certs.py @@ -18,7 +18,7 @@ def where(): """Return the preferred certificate bundle.""" @@ -17,7 +17,7 @@ Last-Update: 2013-01-19 print(where()) --- a/setup.py +++ b/setup.py -@@ -35,7 +35,7 @@ +@@ -41,7 +41,7 @@ author_email='me@kennethreitz.com', url='http://python-requests.org', packages=packages, diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch index 327d7b5..54df371 100644 --- a/debian/patches/02_use-system-chardet-and-urllib3.patch +++ b/debian/patches/02_use-system-chardet-and-urllib3.patch @@ -18,7 +18,7 @@ Last-Update: 2014-01-27 +from urllib3.util import Timeout as TimeoutSauce from .compat import urlparse, basestring, urldefrag, unquote from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - except_on_missing_scheme, get_auth_from_url) + prepend_scheme_if_needed, get_auth_from_url) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import MaxRetryError -from .packages.urllib3.exceptions import TimeoutError @@ -55,7 +55,7 @@ Last-Update: 2014-01-27 builtin_str = str --- a/requests/models.py +++ b/requests/models.py -@@ -17,10 +17,10 @@ +@@ -16,10 +16,10 @@ from .auth import HTTPBasicAuth from .cookies import cookiejar_from_dict, get_cookie_header @@ -72,7 +72,7 @@ Last-Update: 2014-01-27 ChunkedEncodingError, ContentDecodingError) --- a/setup.py +++ b/setup.py -@@ -16,12 +16,6 @@ +@@ -16,13 +16,6 @@ packages = [ 'requests', @@ -81,7 +81,8 @@ Last-Update: 2014-01-27 - 'requests.packages.urllib3', - 'requests.packages.urllib3.packages', - 'requests.packages.urllib3.contrib', -- 'requests.packages.urllib3.packages.ssl_match_hostname' +- 'requests.packages.urllib3.util', +- 'requests.packages.urllib3.packages.ssl_match_hostname', ] requires = [] diff --git a/debian/rules b/debian/rules index c9d82a1..d547907 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,21 @@ export PYBUILD_NAME=requests %: dh $@ --with python2,python3 --buildsystem=pybuild +# The test suite currently requires external network access, so we +# can't enable it. Once this issue is fixed, it will be easy to +# re-enable. +# +# https://github.com/kennethreitz/requests/issues/1166 +# +# barry@debian.org 2014-06-04 +#override_dh_auto_test: +# PYBUILD_SYSTEM=custom \ +# PYBUILD_TEST_ARGS="{interpreter} test_requests.py" \ +# http_proxy= https_proxy= \ +# dh_auto_test + +override_dh_auto_test: + override_dh_installchangelogs: dh_installchangelogs HISTORY.rst |