From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1384767-garchives=archives.gentoo.org@lists.gentoo.org>
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 B9D5F15808B
for <garchives@archives.gentoo.org>; Tue, 12 Apr 2022 01:14:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D6089E096C;
Tue, 12 Apr 2022 01:14:03 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 5E851E096B
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Apr 2022 01:14:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 AE4DC341AF7
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Apr 2022 01:14:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 071E6398
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Apr 2022 01:13:59 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1649725651.c8e61d9aeb9e101fbb37aee80cabe613ae036373.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/cloud-init/cloud-init-20.4.ebuild app-emulation/cloud-init/cloud-init-21.2.ebuild app-emulation/cloud-init/cloud-init-22.1.ebuild
X-VCS-Directories: app-emulation/cloud-init/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c8e61d9aeb9e101fbb37aee80cabe613ae036373
X-VCS-Branch: master
Date: Tue, 12 Apr 2022 01:13:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5e5b7e0f-bfe5-465b-b845-b03cbdcb7872
X-Archives-Hash: afa7655abbaec1a9b609afa4f7a5ad40
commit: c8e61d9aeb9e101fbb37aee80cabe613ae036373
Author: Brett Holman <bholman.devel <AT> gmail <DOT> com>
AuthorDate: Sun Apr 10 18:01:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 01:07:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e61d9a
app-emulation/cloud-init: Backport package dep fixes
These were changed in upstream commits:
4d2684848722cb2d469ad4fa60999bf81cf7056e - May 2, 2020 - six removed
986f37b017134ced5d9dd38b420350916297002b - Mar 10, 2020 - nose -> pytest
8b4a9bc7b81e61943af873bad92e2133f8275b0b - Aug 9, 2021 - netifaces added
Closes: https://github.com/gentoo/gentoo/pull/24980
Signed-off-by: Brett Holman <bholman.devel <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-emulation/cloud-init/cloud-init-20.4.ebuild | 7 +++----
app-emulation/cloud-init/cloud-init-21.2.ebuild | 7 +++----
app-emulation/cloud-init/cloud-init-22.1.ebuild | 5 ++---
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild b/app-emulation/cloud-init/cloud-init-20.4.ebuild
index 89910008a34f..63d26e689413 100644
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -32,14 +32,13 @@ CDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
)
"
@@ -69,8 +68,8 @@ python_prepare_all() {
}
python_test() {
- # Do not use Makefile target as it does not setup environment correclty
- esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+ # Do not use Makefile target as it does not setup environment correctly
+ esetup.py pytest -v cloudinit/ tests/unittests || die
}
python_install() {
diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild b/app-emulation/cloud-init/cloud-init-21.2.ebuild
index 55f12c07641e..0a9661be7209 100644
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -32,14 +32,13 @@ CDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="
${CDEPEND}
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
)
"
@@ -69,8 +68,8 @@ python_prepare_all() {
}
python_test() {
- # Do not use Makefile target as it does not setup environment correclty
- esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+ # Do not use Makefile target as it does not setup environment correctly
+ esetup.py pytest -v cloudinit tests/unittests || die
}
python_install() {
diff --git a/app-emulation/cloud-init/cloud-init-22.1.ebuild b/app-emulation/cloud-init/cloud-init-22.1.ebuild
index ace04bcfa721..fcd8771ebb89 100644
--- a/app-emulation/cloud-init/cloud-init-22.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.1.ebuild
@@ -33,14 +33,13 @@ CDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netifaces[${PYTHON_USEDEP}]
"
DEPEND="
${CDEPEND}
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
)
"
@@ -59,7 +58,7 @@ PATCHES=(
"${FILESDIR}"/22.1-add-support-for-package_upgrade.patch
)
-distutils_enable_tests nose
+distutils_enable_tests pytest
python_prepare_all() {
# Fix location of documentation installation