diff options
| author | Alexander Gerasiov <gerasiov@yandex-team.ru> | 2018-07-10 14:48:20 +0300 |
|---|---|---|
| committer | Alexander Gerasiov <gerasiov@yandex-team.ru> | 2018-09-04 17:48:45 +0300 |
| commit | 18572b091eb9a9bd8ecbd3755dad89121b6078b2 (patch) | |
| tree | 315fd45a6486a7b98dcd986c21e3790818626f3d | |
| parent | 5e06faab1ecaa2d30100f24b39f81e307329a19e (diff) | |
d/patches refreshed.
requirements.patch updated to newer versions in upstream file.
Do-not-require-pip-for-building.patch removed (upstream removed this code itself).
Signed-off-by: Alexander Gerasiov <gerasiov@yandex-team.ru>
| -rw-r--r-- | debian/patches/Do-not-require-pip-for-building.patch | 32 | ||||
| -rw-r--r-- | debian/patches/requirements.patch | 4 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 35 deletions
diff --git a/debian/patches/Do-not-require-pip-for-building.patch b/debian/patches/Do-not-require-pip-for-building.patch deleted file mode 100644 index 30bc1e5..0000000 --- a/debian/patches/Do-not-require-pip-for-building.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Felipe Sateler <fsateler@debian.org> -Date: Sun, 16 Jul 2017 11:34:24 -0400 -Subject: Do not require pip for building - -It is only used to check for docker-py existece, -but that doesn't matter in the context of a debian build ---- - setup.py | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/setup.py b/setup.py -index 4a33c8d..e8f13ee 100644 ---- a/setup.py -+++ b/setup.py -@@ -5,17 +5,8 @@ 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) -- - ROOT_DIR = os.path.dirname(__file__) - SOURCE_DIR = os.path.join(ROOT_DIR) - diff --git a/debian/patches/requirements.patch b/debian/patches/requirements.patch index a3aa38b..e20baa4 100644 --- a/debian/patches/requirements.patch +++ b/debian/patches/requirements.patch @@ -14,7 +14,7 @@ Patch-Name: requirements.patch -backports.ssl-match-hostname==3.5.0.1 -cffi==1.10.0 -cryptography==1.9 --docker-pycreds==0.2.2 +-docker-pycreds==0.3.0 -enum34==1.1.6 -idna==2.5 -ipaddress==1.0.18 @@ -32,7 +32,7 @@ Patch-Name: requirements.patch +backports.ssl-match-hostname>=3.5.0.1 +cffi>=1.10.0 +cryptography>=1.9 -+docker-pycreds>=0.2.2 ++docker-pycreds>=0.3.0 +enum34>=1.1.6 +idna>=2.5 +ipaddress>=1.0.18 diff --git a/debian/patches/series b/debian/patches/series index 0d3bb78..f499a22 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ requirements.patch -Do-not-require-pip-for-building.patch |