| 1 |
commit: 0dff3c31f19740553c5a8f8675e11853bd398496 |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 28 20:53:26 2019 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 28 20:55:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dff3c31 |
| 7 |
|
| 8 |
app-emulation/docker-compose: Fix 1.25.0 for py27 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/701394 |
| 11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.78, Repoman-2.3.16 |
| 13 |
|
| 14 |
...se-1.25.0.ebuild => docker-compose-1.25.0-r1.ebuild} | 4 +++- |
| 15 |
.../files/docker-compose-1.25.0-setup-py.patch | 17 +++++++++-------- |
| 16 |
2 files changed, 12 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild |
| 19 |
similarity index 90% |
| 20 |
rename from app-emulation/docker-compose/docker-compose-1.25.0.ebuild |
| 21 |
rename to app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild |
| 22 |
index b90ebe18f8e..a6f8868eab7 100644 |
| 23 |
--- a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild |
| 24 |
+++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild |
| 25 |
@@ -30,9 +30,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 26 |
>=dev-python/six-1.3.0[${PYTHON_USEDEP}] |
| 27 |
>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] |
| 28 |
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] |
| 29 |
+ $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' ) |
| 30 |
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) |
| 31 |
$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' ) |
| 32 |
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) |
| 33 |
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )" |
| 34 |
+ $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )" |
| 35 |
|
| 36 |
DEPEND="${RDEPEND} |
| 37 |
test? ( <dev-python/pytest-4[${PYTHON_USEDEP}] |
| 38 |
|
| 39 |
diff --git a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch |
| 40 |
index 029dc54bb8f..a56ad638198 100644 |
| 41 |
--- a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch |
| 42 |
+++ b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch |
| 43 |
@@ -1,14 +1,14 @@ |
| 44 |
-From 8f2924d4146ddb1131e98efbee13a68b5445b7f8 Mon Sep 17 00:00:00 2001 |
| 45 |
+From bd58c42fd01829e0dbf475179710e5465655f4b1 Mon Sep 17 00:00:00 2001 |
| 46 |
From: Sebastian Pipping <sebastian@×××××××.org> |
| 47 |
Date: Mon, 18 Nov 2019 23:34:51 +0100 |
| 48 |
Subject: [PATCH] setup.py: Drop generic upper version boundaries |
| 49 |
|
| 50 |
--- |
| 51 |
- setup.py | 36 ++++++++++++++++++------------------ |
| 52 |
- 1 file changed, 18 insertions(+), 18 deletions(-) |
| 53 |
+ setup.py | 38 +++++++++++++++++++------------------- |
| 54 |
+ 1 file changed, 19 insertions(+), 19 deletions(-) |
| 55 |
|
| 56 |
diff --git a/setup.py b/setup.py |
| 57 |
-index 23ae08a..97a8fbe 100644 |
| 58 |
+index 23ae08a..3f6a46f 100644 |
| 59 |
--- a/setup.py |
| 60 |
+++ b/setup.py |
| 61 |
@@ -30,35 +30,35 @@ def find_version(*file_paths): |
| 62 |
@@ -52,13 +52,14 @@ index 23ae08a..97a8fbe 100644 |
| 63 |
- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'], |
| 64 |
- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], |
| 65 |
- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], |
| 66 |
-+ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], |
| 67 |
-+ ':python_version < "3.4"': ['enum34 >= 1.0.4'], |
| 68 |
-+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], |
| 69 |
- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', |
| 70 |
+- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', |
| 71 |
- 'ipaddress >= 1.0.16, < 2'], |
| 72 |
- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], |
| 73 |
- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], |
| 74 |
++ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], |
| 75 |
++ ':python_version < "3.4"': ['enum34 >= 1.0.4'], |
| 76 |
++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], |
| 77 |
++ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0', |
| 78 |
+ 'ipaddress >= 1.0.16'], |
| 79 |
+ ':sys_platform == "win32"': ['colorama >= 0.4'], |
| 80 |
+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], |
Archives