summaryrefslogtreecommitdiff
path: root/app-emulation/docker-compose
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-emulation/docker-compose
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'app-emulation/docker-compose')
-rw-r--r--app-emulation/docker-compose/Manifest10
-rw-r--r--app-emulation/docker-compose/docker-compose-1.25.5.ebuild2
-rw-r--r--app-emulation/docker-compose/docker-compose-1.27.0_rc1.ebuild (renamed from app-emulation/docker-compose/docker-compose-1.25.4-r2.ebuild)15
-rw-r--r--app-emulation/docker-compose/docker-compose-1.27.0_rc2.ebuild (renamed from app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild)19
-rw-r--r--app-emulation/docker-compose/files/docker-compose-1.27.0_rc1-setup-py.patch67
5 files changed, 96 insertions, 17 deletions
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index ca20b87b4e81..a05d47c15424 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -2,15 +2,17 @@ AUX docker-compose-1.25.2-setup-py.patch 2209 BLAKE2B 24cb97379440c94c4f18d99980
AUX docker-compose-1.26.0-setup-py.patch 2410 BLAKE2B c04145747e7a770646687008b6f8aa09e2bf836fce2bcc24b28bc598a0a7f89ffdae21af3f2707c6489d0553aa4697c64bcf5325f2f5b98b090c92a2f53c5a1f SHA512 b92f8401a40e22305c734a5751f4ae4a86e6f74a16cbc8626e223a0f88074a2bb938dad2a1f092755b301cf25ee44ca6899708d1883d4edd477aaec90d7b2847
AUX docker-compose-1.26.1-setup-py.patch 2460 BLAKE2B 502198ab7807ab6dc37e1dc671c72b980d5e1cffc7c6c3efe2281687ba47f0286027b19b781d340e7ba0f9b50bc27393542713301e17d6f4f10ed82b067a45b2 SHA512 2588fb55595e62a1d601f4e723ba2178fb4a9ad8d7ff6f0b1d1b62b0e3d273635665c3b6c257adf6c3ff64bdff7f4706e1bfe81e538723900740e17a3eb19fae
AUX docker-compose-1.26.2-setup-py.patch 2411 BLAKE2B 76e6c2037148a08c46ac1758d58cdaf10785d4b06cd70afc850d30792b49ca7c1d38a305b2d5023eafe64f7271c6f4639aaf008a951b949ade555fc0b48974d1 SHA512 225dbbca638fead6fd0b87da6a185388e3045bee0643337c93686e19b2d3a92996033c5af4c989d60e98b79b68c45ef6aa683b5183ebf9de7468cd210d831c89
-DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019 SHA512 860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e
+AUX docker-compose-1.27.0_rc1-setup-py.patch 1841 BLAKE2B 148e3ba6b8d283113e719d82f96590d522c8476cb3d9ae1031009e2ddf6575831a30236898fce516a858d5e534f8034c2247cecfb5d691e74a1320ad4bad7cb0 SHA512 5d481418570702348adbb1e3de6eca073b42d7d3ba9c850e2cb2f4607de4243bb57dcb702aabd24938e62a2e04612099e65946db44a0b0675b990df23ad9e263
DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b SHA512 efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7
DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25 SHA512 b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512
DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 8320842047700bf5d38f48c21efeafc294f76505ee33c76fbcc0aba78156699bc2d6ec9cb9e52f99125c3eea0f6c4226eaccf850345cfcdc84327c582408e82a SHA512 e655e4930991f0fa3dca07b6b314442dba11ad4203f0eb8ab7175cb25d6cb16aa846198a2e17d4efea5718e184f7d6b6558d5260a86f07855ff4f7791fe8a3b3
DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520 SHA512 4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f
-EBUILD docker-compose-1.25.4-r1.ebuild 1934 BLAKE2B a4e65f590d80a4e73fbe6f9a2b65d544169ba4d3a6224edf3d82bd4f39b4d59239a6aa574f853357f57e09c1cf3b168c41a7ca63404fc363f333a2825dff0688 SHA512 7a0a69eb6f572a3a09f4812473f4ba7719bc7930d29426cde5eded09d70ee36fe7f29f3a1435a5f87aa4773044b0b3b20e49007d9bd88cb3058b7f3a58abc068
-EBUILD docker-compose-1.25.4-r2.ebuild 1936 BLAKE2B 1e10965c9122e6e9a01e479b1cf58c929011c065e3994376c05f6f5a295d82579e83d717a1dd11b6b6ffef6846e137a299a77c89c2c8def0780c8c3dcf46786f SHA512 26059b485b70fe81b65588be4ae93d35bcc03ad19f48fb7ea9f362207f1901fa5e9c212243f0240ed476f69c1eb96230409ea56543ab08636d32077182478694
-EBUILD docker-compose-1.25.5.ebuild 1936 BLAKE2B 1e10965c9122e6e9a01e479b1cf58c929011c065e3994376c05f6f5a295d82579e83d717a1dd11b6b6ffef6846e137a299a77c89c2c8def0780c8c3dcf46786f SHA512 26059b485b70fe81b65588be4ae93d35bcc03ad19f48fb7ea9f362207f1901fa5e9c212243f0240ed476f69c1eb96230409ea56543ab08636d32077182478694
+DIST docker-compose-1.27.0_rc1.tar.gz 308050 BLAKE2B 347dc4b38feae1d045770ff981a289d9919d47cf7ecf3b46e0c7b996bb3ef6d50a7e36751ca5f996dbe8afbeb0d6fc0967945c3abda05b71024a15efae35fb6c SHA512 ae952deeee7c20f4f506c2f0126e504c2cff432056ac45547c40273d6113fe2c51d87c363f0943247989db3dcb20059c7a7839b2c5328d71a41a15cf12db6062
+DIST docker-compose-1.27.0_rc2.tar.gz 308129 BLAKE2B f057d9754040375f71810bbf09cd6a88c9ff05665b4629e0cf45c457b10ff9c4bde1b7a608addb160bcc183d8559a8cb2397f7a2215c1b14ae39577bdb67826b SHA512 556a3b10144ff37996c6e3cd1562ba3fdde2618757d305ead4f861c6614f27bad0cf539885535ca61abaf9e9739bbb1c2b41c489ba87ad75f947213d4cdace19
+EBUILD docker-compose-1.25.5.ebuild 1935 BLAKE2B 1290c12b6cad7e41f6450c68a5284f17acfa505fa3d0dbc1a7489a0d07d960fd1624c273f3fe57ded1c8098b1f69020d8eb3f1c2babff8f63f2b9ba008600579 SHA512 9ceb962c7acb6beaf2a2c5005380be0b2685c6a802cd00795f734034b5a8a43e9272ed665c7d11184ad5247f4d9d76a20f49fe724e901f4d735524c0f1938930
EBUILD docker-compose-1.26.0.ebuild 2075 BLAKE2B d0e7b3869529fc9ee471ecae8a3e3b74a49d119992771dd773b587047677a6e98f206e8f450798a5bba1fd84bd297c499cd9f98cbaf105e8291a1a1899378689 SHA512 ec30e3d9c6f43001dee3b75227b7d4d5d99877fe420d486a3c060f49329b0d10f51be1f49722984f84b81f0b66967b436ea1654e7a9bd7f8120ec7fac47dd633
EBUILD docker-compose-1.26.1.ebuild 2075 BLAKE2B 6fbfe7a1d33817e5de2f20b25d6268a6121733c744120591b971e9c392a9fe183ded1c1603e01da0e9c9eccec0fd8a3543bba6b3b7d9581b7042db4d36b84db8 SHA512 cc9827e7089b7a6fa26905d3b2f52f7b491ab0360093300418752c24820c3b733bcdb6c4e99392b87daefbf61f14d5117d55dbba6ccde641955db4627270887c
EBUILD docker-compose-1.26.2.ebuild 2075 BLAKE2B c8e6bcdd6a79366828d9c4a0993398b56c95681ad61e5114d31065a222005ec53bb2d8afa00ccca215d9e1e46c3ac3e728719f2867dfd5c907913c68aa577a1d SHA512 56c3ef2e46b5b48d691989a424e91cb16d6ba2397254da61e358faa6173c1572bb72c83b2fae78c14c9a5e81672819f09b07551b32d39f59ef4cf06ea0c0a8be
+EBUILD docker-compose-1.27.0_rc1.ebuild 2101 BLAKE2B 2decaaa0488e24e773dc3aedde2bfcc6fc528382517247e01fd24d8569df64e81495a0f228c2618df00077e20f02f2c82fcedacd4041779dbd9c21030d06cb7d SHA512 4e4e4c9b04ab2449bb00d185d9d4c3c3634ddcbda659f84833364a5bc72381571f7239e36fe684e60528f784b53c308b23efc920e85f7f7cfda0ee479669de48
+EBUILD docker-compose-1.27.0_rc2.ebuild 2101 BLAKE2B 23448e65a7048256ba744408fa044e96c6930e4c4fee859c647aae74fc7011aa78beb22632f28f5605380fc01be1100bb3fe6c81d56d1d78cd4eeeed2330db16 SHA512 8df3aa342a7e57c9b9baaabaec28bb8d5d459d1da835f482e5c952d475e18c140f78655a18d80fb541a2ccd4bdcd64a09a55892af8c6bda003500ec0c785838d
MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
diff --git a/app-emulation/docker-compose/docker-compose-1.25.5.ebuild b/app-emulation/docker-compose/docker-compose-1.25.5.ebuild
index 4b9ee3645048..92e8455fcfac 100644
--- a/app-emulation/docker-compose/docker-compose-1.25.5.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.25.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-emulation/docker-compose/docker-compose-1.25.4-r2.ebuild b/app-emulation/docker-compose/docker-compose-1.27.0_rc1.ebuild
index 4b9ee3645048..131856c331f5 100644
--- a/app-emulation/docker-compose/docker-compose-1.25.4-r2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.27.0_rc1.ebuild
@@ -8,9 +8,10 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
inherit bash-completion-r1 distutils-r1
+MY_PV=${PV/_/-}
DESCRIPTION="Multi-container orchestration for Docker"
HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -20,9 +21,11 @@ RESTRICT="!test? ( test )"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-4.2.2[${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}]
>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
dev-python/paramiko[${PYTHON_USEDEP}]
>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
@@ -35,17 +38,19 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
DEPEND="${RDEPEND}
test? (
>=dev-python/pytest-5[${PYTHON_USEDEP}]
- dev-python/ddt[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
)"
-S="${WORKDIR}/compose-${PV}"
+S="${WORKDIR}/compose-${MY_PV}"
PATCHES=(
# Bug #679968 -- https://bugs.gentoo.org/679968
# Bug #681002 -- https://bugs.gentoo.org/681002
- "${FILESDIR}"/${PN}-1.25.2-setup-py.patch
+ "${FILESDIR}"/${PN}-1.27.0_rc1-setup-py.patch
)
+DOCS=( CHANGELOG.md README.md )
+
src_prepare() {
# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
diff --git a/app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.27.0_rc2.ebuild
index 5931b1c8e4a8..1701fb47aed8 100644
--- a/app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.27.0_rc2.ebuild
@@ -8,21 +8,24 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
inherit bash-completion-r1 distutils-r1
+MY_PV=${PV/_/-}
DESCRIPTION="Multi-container orchestration for Docker"
HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-4.3.1[${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}]
>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
dev-python/paramiko[${PYTHON_USEDEP}]
>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
@@ -34,18 +37,20 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
DEPEND="${RDEPEND}
test? (
- <dev-python/pytest-4[${PYTHON_USEDEP}]
- dev-python/ddt[${PYTHON_USEDEP}]
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
)"
-S="${WORKDIR}/compose-${PV}"
+S="${WORKDIR}/compose-${MY_PV}"
PATCHES=(
# Bug #679968 -- https://bugs.gentoo.org/679968
# Bug #681002 -- https://bugs.gentoo.org/681002
- "${FILESDIR}"/${PN}-1.25.2-setup-py.patch
+ "${FILESDIR}"/${PN}-1.27.0_rc1-setup-py.patch
)
+DOCS=( CHANGELOG.md README.md )
+
src_prepare() {
# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
diff --git a/app-emulation/docker-compose/files/docker-compose-1.27.0_rc1-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.27.0_rc1-setup-py.patch
new file mode 100644
index 000000000000..114cc5745815
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.27.0_rc1-setup-py.patch
@@ -0,0 +1,67 @@
+From df01ecc472ebc09754c159fd9f63966cd96985cf Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 11 Aug 2020 21:58:25 +0200
+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 590e0eb..87501b1 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.2.2, < 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.2.2',
++ '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.27.0
+