From e409dea7545701adfcd96d2f0b4e055dcdc5c396 Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Fri, 5 Mar 2021 10:36:56 +0000
Subject: Adding metadata

---
 .../files/pytest-salt-2020.1.27-r2.patch           | 14 +++++++
 .../pytest-salt/pytest-salt-2020.1.27-r1.ebuild    | 39 --------------------
 .../pytest-salt/pytest-salt-2020.1.27-r2.ebuild    | 43 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 39 deletions(-)
 create mode 100644 dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch
 delete mode 100644 dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild
 create mode 100644 dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild

(limited to 'dev-python/pytest-salt')

diff --git a/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch b/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch
new file mode 100644
index 000000000000..35dca262478b
--- /dev/null
+++ b/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch
@@ -0,0 +1,14 @@
+Fixes a Doctestitem has no attribute 'fixturenames'
+Fix by David Denoncin based on https://github.com/saltstack/pytest-salt/issues/48
+
+--- a/pytestsalt/fixtures/daemons.py  2021-03-02 15:19:40.500254583 +0100
++++ b/pytestsalt/fixtures/daemons.py	2021-03-02 15:20:40.706920871 +0100
+@@ -1658,7 +1658,6 @@
+     Fixtures injection based on markers
+     '''
+     for fixture in ('salt_master', 'salt_minion', 'salt_call', 'salt', 'salt_key', 'salt_run'):
+-        if fixture in item.fixturenames:
+-            after_start_fixture = '{}_after_start'.format(fixture)
++        if fixture in getattr(item, 'fixturenames', ()):
+             if after_start_fixture not in item.fixturenames:
+                 item.fixturenames.append(after_start_fixture)
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild
deleted file mode 100644
index f4121676b7c2..000000000000
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-DESCRIPTION="PyTest Salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt"
-SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-"
-#BDEPEND="
-#	test? ( app-admin/salt[${PYTHON_USEDEP}] )
-#"
-
-# tests need network access
-RESTRICT="test"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild
new file mode 100644
index 000000000000..923e601dcbbd
--- /dev/null
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+DESCRIPTION="PyTest Salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt"
+SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+"
+#BDEPEND="
+#	test? ( app-admin/salt[${PYTHON_USEDEP}] )
+#"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2020.1.27-r2.patch"
+)
+
+# tests need network access
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
-- 
cgit v1.3.1