From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 512A015808B for ; Thu, 3 Oct 2024 17:46:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E9C0E29BE; Thu, 3 Oct 2024 17:46:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E6CFE29BE for ; Thu, 3 Oct 2024 17:46:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6315C33FECD for ; Thu, 3 Oct 2024 17:46:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B82CA1293 for ; Thu, 3 Oct 2024 17:46:39 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1727977471.550dbbedd217e5016b9d200b2304a6958ee91209.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/docker-compose/docker-compose-1.29.2-r7.ebuild X-VCS-Directories: app-containers/docker-compose/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 550dbbedd217e5016b9d200b2304a6958ee91209 X-VCS-Branch: master Date: Thu, 3 Oct 2024 17:46:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37d11a80-712f-4573-b432-04e44ad4f40a X-Archives-Hash: b02cfc1d34a7a4836b4e9f713f7a64d3 commit: 550dbbedd217e5016b9d200b2304a6958ee91209 Author: Sebastian Pipping gentoo org> AuthorDate: Thu Oct 3 17:24:36 2024 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Thu Oct 3 17:44:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=550dbbed app-containers/docker-compose: Python 3.12 support for 1.x Also address warning VariableOrderWrong about ${S} Closes: https://bugs.gentoo.org/934519 Signed-off-by: Sebastian Pipping gentoo.org> .../docker-compose/docker-compose-1.29.2-r7.ebuild | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r7.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r7.ebuild new file mode 100644 index 000000000000..57c5fd2f5d6f --- /dev/null +++ b/app-containers/docker-compose/docker-compose-1.29.2-r7.ebuild @@ -0,0 +1,80 @@ +# Copyright 2018-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) + +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/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" + +S="${WORKDIR}/compose-${MY_PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RDEPEND=" + >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] + >=dev-python/docker-7[${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}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] + >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] + >=dev-python/six-1.3.0[${PYTHON_USEDEP}] + >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" + +DEPEND="${RDEPEND} + test? ( + >=dev-python/pytest-5[${PYTHON_USEDEP}] + >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] + dev-python/py[${PYTHON_USEDEP}] + )" + +EPYTEST_DESELECT=( + # These are not ready for >=dev-python/docker-7 + tests/unit/cli/docker_client_test.py::TLSConfigTestCase:: +) + +distutils_enable_tests pytest + +PATCHES=( + # Bug #679968 -- https://bugs.gentoo.org/679968 + # Bug #681002 -- https://bugs.gentoo.org/681002 + "${FILESDIR}"/${PN}-1.29.0-setup-py.patch + "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch + # Bug #920631 -- https://bugs.gentoo.org/920631 + "${FILESDIR}"/${P}-docker-7.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 + + default +} + +python_test() { + epytest tests/unit/ +} + +python_install_all() { + newbashcomp contrib/completion/bash/docker-compose ${PN} + + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/* + + distutils-r1_python_install_all +}