gentoo resync : 22.01.2021

5 files changed, 5 insertions, 89 deletions

diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 398848677f2d..09ec4f8edbc4 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,6 +1,3 @@
-AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
-DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
-EBUILD iniconfig-1.0.0.ebuild 581 BLAKE2B c84511fef6516d9dc2945aab1ea72ab9463dba852a987a4b4cb52b541589f26965a4fe5aa402b7b9ad07c0cdf24f7bc0804a9aecfca6bd84935627243525ffcd SHA512 2f72e8be6e27000637cc4920e667c277e35483d75fd5c712c92a6f4ae3f720ff732e0f29e65947b446f24e50de8f319c0949a25b1cdf5c5b753270dcbfb1c97c
-EBUILD iniconfig-1.1.1.ebuild 536 BLAKE2B a52c461adbd916197518d1b0f8171791d74c29cd5d62bbbb6b31552f244faac1ad4d1d50c299fe016712213e62d9df60d56f3ad3983507058aa6119f04e09753 SHA512 c26851eebe8d527b3435c2098075d003412b87b5c3863e7f0ffce0016069bf47c1a18aebf9660c2692d318b63a02137165bd7b83ec077ab88b85566d07f3bf32
-MISC metadata.xml 290 BLAKE2B 2ce3db3ab43e55c8d7cdb33ef6c04d0242b80927b9b363ae5e0ca3435c4984455cd3c711b50e5e8e1dcef50b814fdff0fa3c82a6eb2fb8199fc2ddb9949dd9f4 SHA512 878fc9a22e172b52509babcafd133caefa1f86153b877641a13447409dd8c0f28d507e71a01587887ee1d01dd5b609e0189cedcd43eaaf519934223c3890b05f
+EBUILD iniconfig-1.1.1.ebuild 534 BLAKE2B d6840ab0476492532db733c6f122745a531e710f3b067d2e906edb05375194583cd5c10ec55515d14992dd5319c1a06c2bb956a6703a72c478446af39e807358 SHA512 c7c1a749779f33f04612c08f3310b5cbbb4f5b9878a6f5cbeb209666820f4d2c41e26462dba856b4d039c44d6411035530c6f84ec4545edea6e371cb022278bb
+MISC metadata.xml 314 BLAKE2B 4d711ba8f750f4c66f8a5131c8d0549d8e13099fef027a4b2267f6bff083283b06d80e9650acf6d8df819fe3be27fe6f18d24dadfc85aab266064d43c32fb863 SHA512 7b1ec3fe73060f3145298dd94d741f7998a9372da8ac16290a25bcddb88d9c5780b4c93fdbf439ebee8ef19b147d41145640a9483af4d4554a6c6f5761f72992
diff --git a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch b/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
deleted file mode 100644
index f8fca367b342..000000000000
--- a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From da205253f0d78204900ec82b6cb2cb0afd9f1254 Mon Sep 17 00:00:00 2001
-From: Stanislav Levin <slev@altlinux.org>
-Date: Thu, 8 Aug 2019 19:43:12 +0300
-Subject: [PATCH] Fix Pytest 5 errors
-
-This fixes
-"""
-pytest.PytestDeprecationWarning: raises(..., 'code(as_a_string)')
-is deprecated, use the context manager form or use `exec()` directly.
-"""
-
-Fixes: https://github.com/RonnyPfannschmidt/iniconfig/issues/6
-Signed-off-by: Stanislav Levin <slev@altlinux.org>
----
- test_iniconfig.py | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/test_iniconfig.py b/test_iniconfig.py
-index 27fd53f..fe12421 100644
---- a/test_iniconfig.py
-+++ b/test_iniconfig.py
-@@ -150,27 +150,25 @@ def test_iniconfig_from_file(tmpdir):
-     assert list(config.sections) == ['metadata']
-     config = IniConfig(path, "[diff]")
-     assert list(config.sections) == ['diff']
--    py.test.raises(TypeError, "IniConfig(data=path.read())")
-+    with pytest.raises(TypeError):
-+        IniConfig(data=path.read())
- 
- 
- def test_iniconfig_section_first(tmpdir):
--    excinfo = py.test.raises(ParseError, """
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='name=1')
--    """)
-     assert excinfo.value.msg == "no section header defined"
- 
- 
- def test_iniconig_section_duplicate_fails():
--    excinfo = py.test.raises(ParseError, r"""
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='[section]\n[section]')
--    """)
-     assert 'duplicate section' in str(excinfo.value)
- 
- 
- def test_iniconfig_duplicate_key_fails():
--    excinfo = py.test.raises(ParseError, r"""
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='[section]\nname = Alice\nname = bob')
--    """)
- 
-     assert 'duplicate name' in str(excinfo.value)
- 
--- 
-2.28.0
-
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
deleted file mode 100644
index 89b47a779d41..000000000000
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Brain-dead simple config-ini parsing"
-HOMEPAGE="
-	https://github.com/RonnyPfannschmidt/iniconfig
-	"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-5.patch
-)
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
index 32d95992678b..5733655e09f4 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/iniconfig/metadata.xml b/dev-python/iniconfig/metadata.xml
index 7b11afae1bb5..6e6146bc1198 100644
--- a/dev-python/iniconfig/metadata.xml
+++ b/dev-python/iniconfig/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">iniconfig</remote-id>
 	</upstream>