gentoo resync : 25.11.2020

3 files changed, 21 insertions, 59 deletions

diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 6e77562cec5d..67db36c1aa68 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,5 +1,5 @@
-DIST bandit-1.5.1.tar.gz 480856 BLAKE2B f8a1a7dc1d93a1b6c8d3eb5bcbecda895b29dfebe055ac358b9437bd0c9ab5562e6d25a658bc2092cff6bddfd0245e71bf39ee88b2718e3a0c7376fa50293ae1 SHA512 e6f596e73af45ca2ff4d200fad63d37adf44efd5de52f8061f5a349b66457a39eb442ad442d5fb57b2e0e98c8bae0eb0879b958ff619b4e26c0183bc8b928e36
 DIST bandit-1.6.2.tar.gz 498567 BLAKE2B ab7885df634ff8258fc7620523b56995cb2f262f4290193a9063e216f66ba8ecb31ec17f09d0b72a0472923266953c46e47e74fcdfb39784873738c033e00c6c SHA512 9facce98411ceb9e33e5a978ca4aad2dab541ffe215e480806ac921b7f7067572445d8e32e8d473ef30bb57155b72b2ffd4e06d458a3da82e2a9fb1b1d8a4b9f
-EBUILD bandit-1.5.1-r1.ebuild 1306 BLAKE2B 785ae6a88bf9debafd723db27c7d8fa528b2894f8d3ce3274530a1f054b490a8d23bffaf5199100515ea0061e3ffded7ce937d23605a0babdf6a13d4747142f1 SHA512 96800f1e97ce5cb38c445bc928192c61eed6e448c4f588508723c2b0fdf59c88151d9988d9603133a71424c862334206d2ef652c150dab949b6d91bd0f94d6d5
-EBUILD bandit-1.6.2.ebuild 1318 BLAKE2B bd8ec00937aa08a8d3d5bc529704434a5944662302146fe79675fa477ea63ea87397b8ee9eee31d1c393c73ac613b46e5ea864d77c3ee49df509c37445f725a2 SHA512 a8ccd57bf1f38cadb91255ac24efa14c407ab199276bb54d67fcaa5740b21434039d16e044baa1360dbf20ba95ec17258326af14070533f9bee4462689afd641
+DIST bandit-1.6.2_py38-1.patch 3892 BLAKE2B 750160be3d234b0d638307e74fd130921f43f460edca8d0ef0f9a98f34db709e0649b1e481668abd094942fa05ee710b82b3161fd82bc56bb0f5e73d90a6e70f SHA512 dc1e55bdcbf180e70757dd92aa590fe1348d84a2143af73e48c35c62864cf0720f6b055482eb274a4261adff37c84f998c75916b8ab70d99264bd88d09611e06
+DIST bandit-1.6.2_py38-2.patch 3724 BLAKE2B 8ce857419d99b059ce1b28aba7c04218397cad82f0fdb6e7eb3e57f698d6360de7b0f4402c40540e41d510db1aa0b75e006e0e15a20a8c5534b7e5a3cf78a0e8 SHA512 25f73b087b296867556d9b9bb7f789a4df64bd2930509086bc24312c43a3a98209d63a5b00009e31fd2653e89c85e62849c7af6ba044abc10c5789a6e3d9a968
+EBUILD bandit-1.6.2-r1.ebuild 1779 BLAKE2B 352b67abdc2e46d9d0c85a2d5ff419ad5e49da28c1e6073296f73e876e7f3d0ed965bc5b77adcd64f5355342ba42e6eb23205020e5e50cb994db4d329cf0d572 SHA512 fabad48d0071d8f3d9e958592589c79e15239b2160c710bfe0d04e8a19698619fe8bc6b5135ffd4ae031b8fd58c764c913c32174b32f0a98ad5edfc586d04c06
 MISC metadata.xml 632 BLAKE2B d36f7c8fa4f8bb896f1eb1ddcdafa2705aeec74ae61c75f2bcebee5b8060442721448afa709099cf2f5d0c6f4dcd9d622c44f94258eb846be36f7d9b82c0ccd6 SHA512 cd90a77633abd61030fe7412b929c129b2e8bb8fe3b265277e8fdbe7b6a9ada8503c5bc97dc6754ba6f4137cfc96bd508b1750bc7b9baa58d823892febb5e955
diff --git a/dev-python/bandit/bandit-1.5.1-r1.ebuild b/dev-python/bandit/bandit-1.5.1-r1.ebuild
deleted file mode 100644
index 998ae418d415..000000000000
--- a/dev-python/bandit/bandit-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://openstack.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~s390 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/hacking-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	stestr init
-	stestr run || die
-}
diff --git a/dev-python/bandit/bandit-1.6.2.ebuild b/dev-python/bandit/bandit-1.6.2-r1.ebuild
index f4cbf20f2c3f..a212a5aca53b 100644
--- a/dev-python/bandit/bandit-1.6.2.ebuild
+++ b/dev-python/bandit/bandit-1.6.2-r1.ebuild
@@ -2,25 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
 DESCRIPTION="A security linter from OpenStack Security"
 HOMEPAGE="https://github.com/PyCQA/bandit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/PyCQA/bandit/commit/45494c94d59eea5ddbe0204f3781b90108cbde30.patch -> ${P}_py38-1.patch
+	https://github.com/PyCQA/bandit/commit/3d0824676974e7e2e9635c10bc4f12e261f1dbdf.patch -> ${P}_py38-2.patch
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~s390 ~x86"
+KEYWORDS="amd64 ~arm64 ~s390 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
@@ -35,13 +36,21 @@ DEPEND="
 		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
-	${CDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
 
+python_prepare() {
+	sed -i 's/yaml.load/yaml.safe_load/g' tests/unit/formatters/test_yaml.py || die
+	eapply "${DISTDIR}/${P}_py38-1.patch"
+	eapply "${DISTDIR}/${P}_py38-2.patch"
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
+	distutils_install_for_testing
 	stestr init
 	stestr run || die
 }