summaryrefslogtreecommitdiffstats
path: root/package/python-docker/0001-setup.py-make-pip-optional.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2019-02-04 10:58:24 +0100
committerPeter Korsgaard <peter@korsgaard.com>2019-02-04 19:23:18 +0100
commitaee3c9ee9e624aa78a5b62e41bcc10af7daab19f (patch)
tree52e1816ea65f4eac3d01b8cb2267a5f7a057af74 /package/python-docker/0001-setup.py-make-pip-optional.patch
parent87f8dae15381029998dfdddd7456db20435dada3 (diff)
downloadbuildroot-aee3c9ee9e624aa78a5b62e41bcc10af7daab19f.tar.gz
buildroot-aee3c9ee9e624aa78a5b62e41bcc10af7daab19f.zip
package/python-docker: bump version to 3.5.1
Pypi now proves a sha256 hash as well. Drop 0001-setup.py-make-pip-optional.patch as upstream has now completely removed the docker-py checks: https://github.com/docker/docker-py/commit/accb9de52f6e383ad0335807f73c8c35bd6e7426 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python-docker/0001-setup.py-make-pip-optional.patch')
-rw-r--r--package/python-docker/0001-setup.py-make-pip-optional.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/package/python-docker/0001-setup.py-make-pip-optional.patch b/package/python-docker/0001-setup.py-make-pip-optional.patch
deleted file mode 100644
index d9c958311d..0000000000
--- a/package/python-docker/0001-setup.py-make-pip-optional.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 978643b7222db66837d39037f884be01fb9af234 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Fri, 9 Mar 2018 18:40:16 +0100
-Subject: [PATCH] setup.py: make pip optional
-
-pip may not be available on the build host, and it is only used to check if
-docker-py is already installed, so skip the check if pip isn't available.
-
-[Upstream-status: submitted (https://github.com/docker/docker-py/pull/1948)]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- setup.py | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 271d94f..c9b91a3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -5,16 +5,20 @@ import codecs
- import os
- import sys
-
--import pip
--
- from setuptools import setup, find_packages
-
--if 'docker-py' in [x.project_name for x in pip.get_installed_distributions()]:
-- print(
-- 'ERROR: "docker-py" needs to be uninstalled before installing this'
-- ' package:\npip uninstall docker-py', file=sys.stderr
-- )
-- sys.exit(1)
-+try:
-+ import pip
-+
-+ if 'docker-py' in \
-+ [x.project_name for x in pip.get_installed_distributions()]:
-+ print(
-+ 'ERROR: "docker-py" needs to be uninstalled before installing this'
-+ ' package:\npip uninstall docker-py', file=sys.stderr
-+ )
-+ sys.exit(1)
-+except ImportError:
-+ pass
-
- ROOT_DIR = os.path.dirname(__file__)
- SOURCE_DIR = os.path.join(ROOT_DIR)
---
-2.11.0
-
OpenPOWER on IntegriCloud