From ee3eb032abdcd9bd1a6e203b1979b754b5a64504 Mon Sep 17 00:00:00 2001 From: Alexander GQ Gerasiov Date: Tue, 29 Jan 2019 00:53:47 +0300 Subject: [PATCH] do-not-use-vendored-code.patch: Refreshed. Signed-off-by: Alexander GQ Gerasiov --- debian/patches/do-not-use-vendored-code.patch | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/debian/patches/do-not-use-vendored-code.patch b/debian/patches/do-not-use-vendored-code.patch index f06da21..635bd9d 100644 --- a/debian/patches/do-not-use-vendored-code.patch +++ b/debian/patches/do-not-use-vendored-code.patch @@ -1,35 +1,17 @@ From: Eric Evans Date: Sun, 29 Nov 2015 12:33:59 -0600 Subject: do-not-use-vendored-code +Last-Update: Tue, 29 Jan 2019 00:51:06 +0300 Upstream botocore includes a couple of vendored modules, and boto3 depends on them transitively. The Debian package of botocore excludes this vendored code, and includes dependencies for the corresponding packages, so we need to do the same, here. ---- - boto3/s3/transfer.py | 3 +-- - tests/functional/test_dynamodb.py | 2 +- - tests/unit/s3/test_transfer.py | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) -Index: python-boto3/tests/functional/test_dynamodb.py -=================================================================== ---- python-boto3.orig/tests/functional/test_dynamodb.py -+++ python-boto3/tests/functional/test_dynamodb.py -@@ -13,7 +13,7 @@ - import json - from tests import unittest, mock - --from botocore.vendored import requests -+import requests - - from boto3.session import Session - from boto3.dynamodb.conditions import Attr -Index: python-boto3/boto3/compat.py -=================================================================== ---- python-boto3.orig/boto3/compat.py -+++ python-boto3/boto3/compat.py -@@ -14,8 +14,7 @@ import sys + +--- a/boto3/compat.py ++++ b/boto3/compat.py +@@ -14,8 +14,7 @@ import os import errno import socket