aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Warsaw <barry@debian.org>2014-11-19 18:00:46 -0500
committerBarry Warsaw <barry@debian.org>2014-11-19 18:00:46 -0500
commit0dd40d0eca2d963b301aa727bcffc6790da706b8 (patch)
tree0a0fd69c9918ee0b8aa24212ebaf281b6cddcfe7
parentf91ee0d37463200ec4b5ce4f15463b8595f61f72 (diff)
parente06f5874676b1d4f1e11b3ce8a75019177316d4f (diff)
downloadpython-requests-0dd40d0eca2d963b301aa727bcffc6790da706b8.tar
python-requests-0dd40d0eca2d963b301aa727bcffc6790da706b8.tar.gz
Imported Debian patch 2.4.3-5
-rw-r--r--debian/changelog10
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules4
3 files changed, 12 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 595cc94..edd52f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+requests (2.4.3-5) unstable; urgency=medium
+
+ * Team upload.
+ * d/control: Remove the Build-Depends on python{,3}-pytest since we
+ aren't actually running the tests at build time. (Closes: #770173)
+ * d/rules: Update the comment about why the tests are currently disabled
+ at build time to point to the updated upstream url.
+
+ -- Barry Warsaw <barry@debian.org> Wed, 19 Nov 2014 18:00:46 -0500
+
requests (2.4.3-4) unstable; urgency=medium
* debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch
diff --git a/debian/control b/debian/control
index bed863d..3cae43c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,10 @@ Build-Depends:
dh-python,
python-all (>= 2.6.6-3),
python-chardet,
- python-pytest,
python-setuptools,
python-urllib3 (>= 1.9.1),
python3-all,
python3-chardet,
- python3-pytest,
python3-setuptools,
python3-urllib3 (>= 1.7.1),
python3-wheel
diff --git a/debian/rules b/debian/rules
index d547907..e06fbba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,9 @@ export PYBUILD_NAME=requests
# can't enable it. Once this issue is fixed, it will be easy to
# re-enable.
#
-# https://github.com/kennethreitz/requests/issues/1166
+# https://github.com/kennethreitz/requests/issues/2184
#
-# barry@debian.org 2014-06-04
+# barry@debian.org 2014-11-19
#override_dh_auto_test:
# PYBUILD_SYSTEM=custom \
# PYBUILD_TEST_ARGS="{interpreter} test_requests.py" \