gentoo auto-resync : 11:04:2023 - 23:39:54

5 files changed, 7 insertions, 137 deletions

diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 76ed9af69f35..1106bf82d0c3 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,6 +1,3 @@
-AUX bandit-1.7.4-tomli.patch 2465 BLAKE2B ad8f0e6a5880a29d97e3d3f58d58cdf748308605a7dda4817726e8d11f9b8f1d3847cabbf608b6e49c0c85e7e29572625fdfbb681092cab0ebdca6c452c651aa SHA512 2f3a4abdd0b3f25593cea35e10a16971b8df6676e157947a7a8fce8c0f4dcc9f196c7adff3ca62ef8fd3ed7610c2d0be9c850d23c037581d3124d07ffde53f83
-DIST bandit-1.7.4.tar.gz 495104 BLAKE2B 5531a602dea877745ebdecf768fa83e0e478c52d472fbfdf98fec32c73a76a73e4f6dd957be760b4757e47c5f9cc25f6cd2f6c593df1e54165e647950a9f8a54 SHA512 93e1a25fd41e9409971f4cbac2ff73971ba270936a6b2aeecb3e0a2aa2015bcefd5eaab3cc94b2d9d96e4604d1a39c5ca1150c9eadd073357a90c5265c592407
 DIST bandit-1.7.5.tar.gz 1970878 BLAKE2B 45787b6d1ebebb5ce25fa67173095a0e97b6f95992d828530cfade8c7f50d0c7b945884539695426f93cf3ed6a42178e18501768aa32c3b0c7019eb20aa3bc95 SHA512 81b93654ba62e6d22e8c2d534b9f575979bad4f66acd90c221d214316cd1863e7c7e179b8e2a2a8fa80034db71ebda8636adb25b36e1827194bb4639e67ada09
-EBUILD bandit-1.7.4-r1.ebuild 1131 BLAKE2B 63bdd78d59688da4847f6baedd1ff926290ac81dd6d83d6de74e7059d4bb7550bf1ec611f7f81524a4d7929e662e402f762eed43bd4fa34130971ae2dcccb529 SHA512 22d3ec188e4d7bf2c5dfaf397b8fc35727d18d441b5113b5259d12b191900247ba0221c5bdfeefb0a115d382eb4735b1cd48bd41369a5932f43dba1869638bd3
-EBUILD bandit-1.7.5-r1.ebuild 1085 BLAKE2B c48bb81001da1c081b6cad39c05b1aa5aacae2b54a2626bc0624c5f55dee86fd469f305e8ed4c9cc2108be71630313c767f91e27a9edc12ba2a17e246bac03df SHA512 d748d88fc3d8ab0c47079a79d09bef7a74192c1f644ce0113e15b4acd25d59044040d6ecb7afe6a926a1cbc5f3ad0a5102372ef243c9010bb510ec0e0dbd45ff
-MISC metadata.xml 709 BLAKE2B 845208c1e800577f159e34675344ce540c61888393dfcfc2f7c47e77ccfd4784cb3f1990b25b78f97d62c8b5c53feaadfdc894990333a09b7938a90be68b8815 SHA512 ba2c6de072973fcd891e4e161a43d52100df89f13243765cb5b2f2ccd7ef7a5266d8fd6e8d373859b53d6743c1de5b0733d5bb4f81b4a94d95843e0593e9dc8f
+EBUILD bandit-1.7.5-r1.ebuild 1082 BLAKE2B e2fd787732557b27d5bb9ce290cf0fb37303a96276e2d75ae8a9ee5a73e36fe9e58fb63d20aa05330582c08427e64dfe2a33808b2cceab9f3833a370e4b069bc SHA512 b7d1a415710b5a8bae4b8153a13f3059febb0fb3e8c0e85fa50ea283a3d647e48caa0d9e4460b329a9eb7303b921c530708e6ff121e49870d7dc8f7367f1faab
+MISC metadata.xml 810 BLAKE2B 6f836d0afbb33f233618f056a9d4161cbdafe93abbed2f321e4e799bb75a86e2c4cc27cd43e74d05e1a15496ecf52e6a575ecd8dd4ae463ee37f742331b0086d SHA512 e3dc0280839cb1a54a2585fd6fe19fce66ceff73a7e010479e99e9631c224851b303d577b5de0ba62bc94b78b9b75b30c0103421441bba9753e4231bc3914481
diff --git a/dev-python/bandit/bandit-1.7.4-r1.ebuild b/dev-python/bandit/bandit-1.7.4-r1.ebuild
deleted file mode 100644
index 769c2883561f..000000000000
--- a/dev-python/bandit/bandit-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="
-	https://github.com/PyCQA/bandit/
-	https://pypi.org/project/bandit/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.{8..10})
-	)
-"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tomli.patch
-)
diff --git a/dev-python/bandit/bandit-1.7.5-r1.ebuild b/dev-python/bandit/bandit-1.7.5-r1.ebuild
index ebc40d6fbb49..e905558974c0 100644
--- a/dev-python/bandit/bandit-1.7.5-r1.ebuild
+++ b/dev-python/bandit/bandit-1.7.5-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bandit/files/bandit-1.7.4-tomli.patch b/dev-python/bandit/files/bandit-1.7.4-tomli.patch
deleted file mode 100644
index 238cc1f6d352..000000000000
--- a/dev-python/bandit/files/bandit-1.7.4-tomli.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 5a8f1050011a6eeca96c1b8a0fe1988fda97f214 Mon Sep 17 00:00:00 2001
-From: Mathieu Kniewallner <mathieu.kniewallner@gmail.com>
-Date: Fri, 25 Mar 2022 23:27:56 +0100
-Subject: [PATCH] Replace `toml` with `tomli` (#829)
-
-* Replace `toml` with `tomli`
-
-* Only require `tomli` on Python < 3.11
-
-* Update test-requirements.txt
-
-Co-authored-by: Eric Brown <ericwb@users.noreply.github.com>
----
- bandit/core/config.py | 20 ++++++++++++--------
- setup.cfg             |  2 +-
- test-requirements.txt |  2 +-
- 3 files changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/bandit/core/config.py b/bandit/core/config.py
-index 7c259bcc..236f357c 100644
---- a/bandit/core/config.py
-+++ b/bandit/core/config.py
-@@ -3,13 +3,17 @@
- #
- # SPDX-License-Identifier: Apache-2.0
- import logging
-+import sys
- 
- import yaml
- 
--try:
--    import toml
--except ImportError:
--    toml = None
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    try:
-+        import tomli as tomllib
-+    except ImportError:
-+        tomllib = None
- 
- from bandit.core import constants
- from bandit.core import extension_loader
-@@ -34,14 +38,14 @@ def __init__(self, config_file=None):
- 
-         if config_file:
-             try:
--                f = open(config_file)
-+                f = open(config_file, "rb")
-             except OSError:
-                 raise utils.ConfigError(
-                     "Could not read config file.", config_file
-                 )
- 
-             if config_file.endswith(".toml"):
--                if toml is None:
-+                if tomllib is None:
-                     raise utils.ConfigError(
-                         "toml parser not available, reinstall with toml extra",
-                         config_file,
-@@ -49,8 +53,8 @@ def __init__(self, config_file=None):
- 
-                 try:
-                     with f:
--                        self._config = toml.load(f)["tool"]["bandit"]
--                except toml.TomlDecodeError as err:
-+                        self._config = tomllib.load(f)["tool"]["bandit"]
-+                except tomllib.TOMLDecodeError as err:
-                     LOG.error(err)
-                     raise utils.ConfigError("Error parsing file.", config_file)
-             else:
-diff --git a/setup.cfg b/setup.cfg
-index 5d570eea..7449f15b 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -31,7 +31,7 @@ project_urls =
- yaml = 
- 	PyYAML
- toml = 
--	toml
-+	tomli>=1.1.0; python_version < "3.11"
- 
- [entry_points]
- console_scripts =
diff --git a/dev-python/bandit/metadata.xml b/dev-python/bandit/metadata.xml
index 87ea544cd31c..a083c37dbb02 100644
--- a/dev-python/bandit/metadata.xml
+++ b/dev-python/bandit/metadata.xml
@@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Bandit is a tool designed to find common security issues in Python code. To do this Bandit processes each file, builds an AST from it, and runs appropriate plugins against the AST nodes. Once Bandit has finished scanning all the files it generates a report.
 	</longdescription>