From 38418a4076a8682929cdeb0f731a4aaf13ac697f Mon Sep 17 00:00:00 2001 From: Noah Meyerhans Date: Mon, 12 Dec 2022 09:06:46 -0800 Subject: [PATCH] Refresh patches --- debian/patches/do-not-use-vendored-code.patch | 24 ------------------- debian/patches/series | 1 - 2 files changed, 25 deletions(-) delete mode 100644 debian/patches/do-not-use-vendored-code.patch diff --git a/debian/patches/do-not-use-vendored-code.patch b/debian/patches/do-not-use-vendored-code.patch deleted file mode 100644 index e5fd529..0000000 --- a/debian/patches/do-not-use-vendored-code.patch +++ /dev/null @@ -1,24 +0,0 @@ -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. - - -Index: python-boto3/boto3/compat.py -=================================================================== ---- python-boto3.orig/boto3/compat.py -+++ python-boto3/boto3/compat.py -@@ -16,7 +16,7 @@ import errno - import socket - import warnings - --from botocore.vendored import six -+import six - from boto3.exceptions import PythonDeprecationWarning - - if six.PY3: diff --git a/debian/patches/series b/debian/patches/series index 162968b..f1d305b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -do-not-use-vendored-code.patch strip-shortbread-js