diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /app-emulation/docker-compose | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'app-emulation/docker-compose')
-rw-r--r-- | app-emulation/docker-compose/Manifest | 11 | ||||
-rw-r--r-- | app-emulation/docker-compose/docker-compose-1.28.4.ebuild (renamed from app-emulation/docker-compose/docker-compose-1.28.0.ebuild) | 4 | ||||
-rw-r--r-- | app-emulation/docker-compose/docker-compose-1.28.5.ebuild (renamed from app-emulation/docker-compose/docker-compose-1.28.2.ebuild) | 4 | ||||
-rw-r--r-- | app-emulation/docker-compose/files/docker-compose-1.28.4-setup-py.patch (renamed from app-emulation/docker-compose/files/docker-compose-1.28.0_rc2-setup-py.patch) | 4 | ||||
-rw-r--r-- | app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch | 67 |
5 files changed, 79 insertions, 11 deletions
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index ec4a1bee15a7..7b88e508120a 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,9 +1,10 @@ AUX docker-compose-1.27.0_rc3-setup-py.patch 1840 BLAKE2B 15269cc09ad609008afbf2d61beabc5242d63f2e3c6cfb8c65c1768de3aea559dd99e6ab7ff6acd1b93420402d0a176fdb1390c5477c7820e3173b0ff2d39853 SHA512 12a1b996a8d37289991ea979ddf1a303241217f43b26df5b7d2a1241006c7de38234c11ed0b9e99ca92348159d0681c3316e3413a4d639c13fa29acb0ae8cf23 -AUX docker-compose-1.28.0_rc2-setup-py.patch 1844 BLAKE2B d33325e712bd3d3d5eb0dc1969d41e9b71876901414aa29da75f881007bcade7af8e66a2b24cd3e9ceb0be545050c93e8b21814d4d396024aa7ccd365e13b5e5 SHA512 9cf33c42ee436905aa58343c2acaa1147ff241d06f4002f86073a0ee3632a2fc67a70f87502ffc208b7f38294d11431d7fc0da23d064ebea1262117230ba167a +AUX docker-compose-1.28.4-setup-py.patch 1844 BLAKE2B 5e9d683c5e90d30662555c050a07a3d13dd646028b62b9abfa19c84b9e3d0395fe2cedccbc8c352d6c2b89aca0244c750942ba7fb5e25fd2721c18bb47b6d008 SHA512 c60a3d56def25bdf9e884f0af8dcbba8e30d6aa05a8fc3efbef170807f007e67c2177340d6992688d531a937fbd2671656ddf74273dd4c8b4b5511dd73795cd1 +AUX docker-compose-1.28.5-setup-py.patch 1844 BLAKE2B 5fee25a003a6c0b2afcb17a38959a8f0c2284ec3f6a8ff2e09afee946dd68a4ef36d66b629922867baf7e16db26ec9b89aa943b7f1f4ee134d0881fa76024290 SHA512 fdc35b95a3a43c250aec3f71b5322badaac45a03ab17dce789ae114b0a9a5f2a493d07d3b177e295cd0ad94f0bda191eaae139517a50e229de1de599216e888e DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80 -DIST docker-compose-1.28.0.tar.gz 318112 BLAKE2B 2e721f2aed08f8c63c7c75aa91e6ee28d997763a7d93921e9a62c41b7d48943221aa2135e6ba3925db67b2376f662f81ef71df15180895ea4d5ced1edd0cc493 SHA512 c673f25ff993e7dcaf75512c378339bb7435d96310bf9a47ee3fd3a515967b323ed911b77c030a8e9c1d04b8aca235565a0ca0eaeab401c4ac48110712da405e -DIST docker-compose-1.28.2.tar.gz 318196 BLAKE2B 60827043135b1b1455ce0fe8cd3b6bdfad025af80d32b805e7a7a9df7949808b6575555e860a2d0f57bf07af44cb7847b38146accbb2c4eec9a8919bc4ec4141 SHA512 ababba47717e31187243478ba4a9d4082e2f64a05a0bf48cbafb2a44b62138d7dfb1cbb88da4c388b559cb35d53bcf4c42617f6ae02412b7a65f02cb09255e45 +DIST docker-compose-1.28.4.tar.gz 318110 BLAKE2B 97a39c52a2e9819fa4632a16080b9b3a029c5b81caa1bcb5143e78b9c6f3981aa462ef23c6c08fcafe80f8b786ce4962959dc84fd4fe2003ceee3dddcb85f438 SHA512 ba0b8a8a87e154c36b499b0fbb422847bcec421bdcbb6a7fc4a4d8169ae410f6bb71867fbff42b670b3d5ae61101527eeb71e68d57458906796e2d64adc0e367 +DIST docker-compose-1.28.5.tar.gz 318236 BLAKE2B 32aca16fdebd00c5b211404e82b44b9486340bfa379d4739d164d5aa75d4f35b95d914065c05fef585ea7e412035e582d8058f2b942a4ce17a9b2bc25ff0cd31 SHA512 1f2cc87b82d18c023e8c2d9eb2e991393c96f7a3ab17fa6871d0969a28162b6832f98b42c76cadc641416629f74eb00763c89e044ae8cf02a062bd74b58371c9 EBUILD docker-compose-1.27.4.ebuild 2108 BLAKE2B 9d7a0dfad313a4311a188076d2cb06975f15a36d98d030c9f5bda18f0d5d7d35d70d65e0ddfa817eef560e575004e7c05f9b06e3a2a0582096f3d8476d480916 SHA512 e378202a4f2ae68eda0750a391d74c7fc9a2bc7614d4db4fffd32b6ca683989ef71e73c72a1d00e5e687296500c06a072c82c3b959b1c794f8942fdd94c33096 -EBUILD docker-compose-1.28.0.ebuild 2110 BLAKE2B bd958943a59a86265c73e0b91e3343e8612842d9a3bfa46daf92f216f4d96ad5502ec010be1a76e4ff217ac2cdd451b4c65242d8cccac1f93ccc543482b16e77 SHA512 f3de0fff00f8d8bee48c4642e1c07a764c2ed96532d0bffe6a7d5ff92f42b30e6f97212fb4b4effbdc455c93af117206c021cb4442e2eaa8f316577ead7a09d3 -EBUILD docker-compose-1.28.2.ebuild 2110 BLAKE2B bd958943a59a86265c73e0b91e3343e8612842d9a3bfa46daf92f216f4d96ad5502ec010be1a76e4ff217ac2cdd451b4c65242d8cccac1f93ccc543482b16e77 SHA512 f3de0fff00f8d8bee48c4642e1c07a764c2ed96532d0bffe6a7d5ff92f42b30e6f97212fb4b4effbdc455c93af117206c021cb4442e2eaa8f316577ead7a09d3 +EBUILD docker-compose-1.28.4.ebuild 2106 BLAKE2B aca5e45b0979591607a9468e4dfd1d74cdc46a6ca37f1bee0efd7ff74a043fe5d70f7a1d6b0e88f494f3be8791054a8c58afcf99a4ff45665599f2a59a92cef1 SHA512 29ac7efdddf077305e3aafed0786cfaa0af39c839e7fe129d20f540b17ad7b1d1ef276d574201be3e619aa2506b31d3909fbc709d097b59bfd59e4abe700c615 +EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be6f720ed4399735428abc46aba3e02b9ea11f3a34796f6fd89bce60e4ad614ec232293aa57c884412c5fa314bd3e9d1b65 SHA512 9310c2ac24b9d0d31505f78b1bfeaa0c87017c91bac5008de531f283fc4fd0a98343c8c80037616f427e9ed5d59e18dc6dfa96de297d19a580597727cfeff1a9 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e diff --git a/app-emulation/docker-compose/docker-compose-1.28.0.ebuild b/app-emulation/docker-compose/docker-compose-1.28.4.ebuild index d610f83bb59a..0465f3ab0853 100644 --- a/app-emulation/docker-compose/docker-compose-1.28.0.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.28.4.ebuild @@ -22,7 +22,7 @@ RESTRICT="!test? ( test )" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}] + >=dev-python/docker-py-4.4.3[${PYTHON_USEDEP}] >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] @@ -46,7 +46,7 @@ S="${WORKDIR}/compose-${MY_PV}" PATCHES=( # Bug #679968 -- https://bugs.gentoo.org/679968 # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch + "${FILESDIR}"/${PN}-1.28.4-setup-py.patch ) DOCS=( CHANGELOG.md README.md ) diff --git a/app-emulation/docker-compose/docker-compose-1.28.2.ebuild b/app-emulation/docker-compose/docker-compose-1.28.5.ebuild index d610f83bb59a..c59a93b5bff8 100644 --- a/app-emulation/docker-compose/docker-compose-1.28.2.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.28.5.ebuild @@ -22,7 +22,7 @@ RESTRICT="!test? ( test )" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}] + >=dev-python/docker-py-4.4.4[${PYTHON_USEDEP}] >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] @@ -46,7 +46,7 @@ S="${WORKDIR}/compose-${MY_PV}" PATCHES=( # Bug #679968 -- https://bugs.gentoo.org/679968 # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch + "${FILESDIR}"/${PN}-1.28.5-setup-py.patch ) DOCS=( CHANGELOG.md README.md ) diff --git a/app-emulation/docker-compose/files/docker-compose-1.28.0_rc2-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.28.4-setup-py.patch index 0eaac41d742a..79b1c168170f 100644 --- a/app-emulation/docker-compose/files/docker-compose-1.28.0_rc2-setup-py.patch +++ b/app-emulation/docker-compose/files/docker-compose-1.28.4-setup-py.patch @@ -22,7 +22,7 @@ index 57e1313..94a3337 100644 - 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', - 'distro >= 1.5.0, < 2', -- 'docker[ssh] >= 4.4.0, < 5', +- 'docker[ssh] >= 4.4.3, < 5', - 'dockerpty >= 0.4.1, < 1', - 'jsonschema >= 2.5.1, < 4', - 'python-dotenv >= 0.13.0, < 1', @@ -33,7 +33,7 @@ index 57e1313..94a3337 100644 + 'texttable >= 0.9.0', + 'websocket-client >= 0.32.0', + 'distro >= 1.5.0', -+ 'docker[ssh] >= 4.4.0', ++ 'docker[ssh] >= 4.4.3', + 'dockerpty >= 0.4.1', + 'jsonschema >= 2.5.1', + 'python-dotenv >= 0.13.0', diff --git a/app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch new file mode 100644 index 000000000000..75967139165a --- /dev/null +++ b/app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch @@ -0,0 +1,67 @@ +From 7a5520d0b478e9bb20c9c3ff2614a8afd392b020 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Mon, 4 Jan 2021 17:36:44 +0100 +Subject: [PATCH] setup.py: Drop generic upper version boundaries + +--- + setup.py | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/setup.py b/setup.py +index 57e1313..94a3337 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,33 +25,33 @@ def find_version(*file_paths): + + + install_requires = [ +- 'cached-property >= 1.2.0, < 2', +- 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 6', +- 'requests >= 2.20.0, < 3', +- 'texttable >= 0.9.0, < 2', +- 'websocket-client >= 0.32.0, < 1', +- 'distro >= 1.5.0, < 2', +- 'docker[ssh] >= 4.4.4, < 5', +- 'dockerpty >= 0.4.1, < 1', +- 'jsonschema >= 2.5.1, < 4', +- 'python-dotenv >= 0.13.0, < 1', ++ 'cached-property >= 1.2.0', ++ 'docopt >= 0.6.1', ++ 'PyYAML >= 3.10', ++ 'requests >= 2.20.0', ++ 'texttable >= 0.9.0', ++ 'websocket-client >= 0.32.0', ++ 'distro >= 1.5.0', ++ 'docker[ssh] >= 4.4.4', ++ 'dockerpty >= 0.4.1', ++ 'jsonschema >= 2.5.1', ++ 'python-dotenv >= 0.13.0', + ] + + + tests_require = [ +- 'ddt >= 1.2.2, < 2', +- 'pytest < 6', ++ 'ddt >= 1.2.2', ++ 'pytest', + ] + + + if sys.version_info[:2] < (3, 4): +- tests_require.append('mock >= 1.0.1, < 4') ++ tests_require.append('mock >= 1.0.1') + + extras_require = { +- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], +- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], ++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], ++ ':sys_platform == "win32"': ['colorama >= 0.4'], ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + 'tests': tests_require, + } + +-- +2.30.0.rc2 + |