commit: 190ebb8717d0a03f0edb5c2fee2260a5e556d039
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 18:34:34 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 18:39:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190ebb87
dev-python/bandit: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/bandit/Manifest | 1 -
dev-python/bandit/bandit-1.7.4-r1.ebuild | 46 -------------
dev-python/bandit/files/bandit-1.7.4-tomli.patch | 85 ------------------------
3 files changed, 132 deletions(-)
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 5ea983280e27..7fca10fffcf3 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,2 +1 @@
-DIST bandit-1.7.4.tar.gz 495104 BLAKE2B
5531a602dea877745ebdecf768fa83e0e478c52d472fbfdf98fec32c73a76a73e4f6dd957be760b4757e47c5f9cc25f6cd2f6c593df1e54165e647950a9f8a54
SHA512
93e1a25fd41e9409971f4cbac2ff73971ba270936a6b2aeecb3e0a2aa2015bcefd5eaab3cc94b2d9d96e4604d1a39c5ca1150c9eadd073357a90c5265c592407
DIST bandit-1.7.5.tar.gz 1970878 BLAKE2B
45787b6d1ebebb5ce25fa67173095a0e97b6f95992d828530cfade8c7f50d0c7b945884539695426f93cf3ed6a42178e18501768aa32c3b0c7019eb20aa3bc95
SHA512
81b93654ba62e6d22e8c2d534b9f575979bad4f66acd90c221d214316cd1863e7c7e179b8e2a2a8fa80034db71ebda8636adb25b36e1827194bb4639e67ada09
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/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.kniewall...@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 <eri...@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 =
