gentoo resync : 03.03.2021

7 files changed, 4 insertions, 188 deletions

diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 938765899aac..817b64a77487 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,14 +1,7 @@
-AUX alembic-1.4.3-pytest6.patch 2379 BLAKE2B 3c43194ce234703b10e87a8d8746efef96b317b1d23fbd19c1cea4a8809bf68e0a3908314948afb61f5b8081ac021d51d329c4b064f026ce33ed8ffe2919fb3d SHA512 390f3a605649c0c927edb2746906b703cf293879e9cc18be6a87a646ddb8032eeba837f7c4df4a9d82187bd9bb3af5955a815df3428e966ec7b4e7e8fb43de87
-DIST alembic-1.4.3.tar.gz 1108131 BLAKE2B d9c8b6d6aebce7a45194dd6c654f4a2627714a5c1f7cb7a1cf80ed8c3fe861e3bb7857811128787ddd6c093b4370784b40cddb385cfbd30f6134d537fe949d2d SHA512 925d8957fd9008d041737a9e79ec8d7a4c5deba1976e980362d355a75348c1638d783d9d48234a5bc3b2dc3f2f09dcb281d0c80ae0f0c5bc32e176c3dfa05463
-DIST alembic-1.5.0.tar.gz 1128073 BLAKE2B 067ebe7a8ee9b14fc782e0f5268990b07a8ae91ab8ae89daee119bb64f30b8cb966ff22ce71c67e476fafce7ae418952f253645b0f5b5b8a1abbf7f562794138 SHA512 a667e5b176770061c27ea7fdaafdbcdad64d968e22e729083fadd8e002530cc43909a955c3ccaa04329c393ab3f27ec5b944b03ba0ae5d29609b940e7cfb8ad5
 DIST alembic-1.5.1.tar.gz 1128404 BLAKE2B 70a2ce16adcf317c9376f77d8fa88e9eef3aa4090de5f933187f47df9fe6ac40a25df75d6c74c50c3be23dd3cef13d465eb2ddae4ea83558d01ebffd8effe241 SHA512 2fe490c46c253123333f0496fe28b59956efc78924f145b69ba95e5cb1cc091a72047c1aa5f8a85924ec59ad0aba2bfa143b9cad475dedc6f849c38695c08601
-DIST alembic-1.5.2.tar.gz 1129660 BLAKE2B ab8800adb9a46e98adfed558a98328cbb06f53c4e1c47a7ac2f9f559e807aa81955295496404569aff53bee449213bc40232d070403e72098a27e789ea2a7b96 SHA512 35a00cee17d626aec55d6fe5b99dec58dfc52167a1ff1559cb69a45b9eccdaf1a0ceb58f8c2bd0d6e590ac2577fea32d82b412b5e706d0b9c183775d44253668
-DIST alembic-1.5.3.tar.gz 1132015 BLAKE2B b3a1e54b365f1b60edbb2c3052d3a0b822e6f3dfe398d58ba3dc9504cf081476abf7af79dab2233629765185a7d1d69af7fabcdbe8328c54b39c81034e55ceab SHA512 0859b21b35854ddcb98f020a03659cdb4c56833a84f868db545aae51b62eddf3c4f76c0d00dd1d5fbd1259766b90f9f5b11e1f5e99db8d8752015aded12ca185
 DIST alembic-1.5.4.tar.gz 1133598 BLAKE2B 88e1f40ef1935b90de789f1adc99edb5fc580c96a3e86a672cc9cfd694e79e940ba696efe560db3bf2878420a168382ed4342cbf1b8c7b9bbbf084532b8da402 SHA512 190f8fe96f18541fd62802e026e93c332f6046618cb89d4f9a6b478505742671d363de1161feeccd8873036a458743165080b5a0e2e55e1d0dd81e617c8cd4ad
-EBUILD alembic-1.4.3.ebuild 1097 BLAKE2B a48797aa3134bf0f4530aa3ce2a35bcaa42f16afe074bceb9028003acb98ce3148f8f72596a6bd08224ac8b762a489b57b7836774e7f58ce543d511086a3991a SHA512 6a3b2b04e1b2ae5856f29a2992637541db939f0e9af1ca65e2275f235fde033505e11ea180c459eea69cb870a2c55ecb591b0aaf54081893eedc8efdef7a1de5
-EBUILD alembic-1.5.0.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
-EBUILD alembic-1.5.1.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
-EBUILD alembic-1.5.2.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
-EBUILD alembic-1.5.3.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+DIST alembic-1.5.5.tar.gz 1150308 BLAKE2B 33db8a0ea00802b37d3e24ca43232a993bfc333e232fa08b8dd0560dfec5f18f4fa82bcc3c34a776c88c8fc8d3645c4501a9dde8e4e5411bc255eb654183d01a SHA512 a4078c66bbe1627620224f965b879c46453bc74e6a2a902619df28912f55b27f086cba68f08bc8c0a37bd221ac16e195f7f905379fd5d191854adb7f90f86530
+EBUILD alembic-1.5.1.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
 EBUILD alembic-1.5.4.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+EBUILD alembic-1.5.5.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
 MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.4.3.ebuild b/dev-python/alembic/alembic-1.4.3.ebuild
deleted file mode 100644
index f6411be87c89..000000000000
--- a/dev-python/alembic/alembic-1.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# https://github.com/sqlalchemy/alembic/commit/8690940976544f368dad31cfbc46d9e1426b2ce1
-	"${FILESDIR}/${P}-pytest6.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# suite passes all if run from source. The residual fail & error are quite erroneous
-	rm tests/test_script_consumption.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.5.1.ebuild b/dev-python/alembic/alembic-1.5.1.ebuild
index 32d428a7bdf3..b0a59134f8e1 100644
--- a/dev-python/alembic/alembic-1.5.1.ebuild
+++ b/dev-python/alembic/alembic-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/alembic/alembic-1.5.2.ebuild b/dev-python/alembic/alembic-1.5.2.ebuild
deleted file mode 100644
index 32d428a7bdf3..000000000000
--- a/dev-python/alembic/alembic-1.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.5.3.ebuild b/dev-python/alembic/alembic-1.5.3.ebuild
deleted file mode 100644
index 32d428a7bdf3..000000000000
--- a/dev-python/alembic/alembic-1.5.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.5.0.ebuild b/dev-python/alembic/alembic-1.5.5.ebuild
index 32d428a7bdf3..32d428a7bdf3 100644
--- a/dev-python/alembic/alembic-1.5.0.ebuild
+++ b/dev-python/alembic/alembic-1.5.5.ebuild
diff --git a/dev-python/alembic/files/alembic-1.4.3-pytest6.patch b/dev-python/alembic/files/alembic-1.4.3-pytest6.patch
deleted file mode 100644
index ecf21a7ca58f..000000000000
--- a/dev-python/alembic/files/alembic-1.4.3-pytest6.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 8690940976544f368dad31cfbc46d9e1426b2ce1 Mon Sep 17 00:00:00 2001
-From: Mike Bayer <mike_mp@zzzcomputing.com>
-Date: Sat, 26 Sep 2020 21:05:53 -0400
-Subject: [PATCH] Support pytest 6.x
-
-pytest has removed support for pytest.Class(..parent)
-and we need to use from_parent.
-
-Also works around new issue for 6.1.0
-
-References: https://github.com/pytest-dev/pytest/issues/7807
-
-Change-Id: Ia5fed9b22e76c99f71489283acee207f996f52a4
----
- alembic/__init__.py                    |  2 +-
- alembic/testing/plugin/pytestplugin.py | 10 ++--------
- tox.ini                                |  4 ++--
- 3 files changed, 5 insertions(+), 11 deletions(-)
-
- sys.modules["alembic.migration"] = migration
- sys.modules["alembic.environment"] = environment
-diff --git a/alembic/testing/plugin/pytestplugin.py b/alembic/testing/plugin/pytestplugin.py
-index 1c8be05..ba3d35b 100644
---- a/alembic/testing/plugin/pytestplugin.py
-+++ b/alembic/testing/plugin/pytestplugin.py
-@@ -33,16 +33,10 @@ def pytest_configure(config):
- def pytest_pycollect_makeitem(collector, name, obj):
- 
-     if inspect.isclass(obj) and plugin_base.want_class(name, obj):
--
--        # in pytest 5.4.0
--        # return [
--        #     pytest.Class.from_parent(collector,
--        # name=parametrize_cls.__name__)
--        #     for parametrize_cls in _parametrize_cls(collector.module, obj)
--        # ]
-+        ctor = getattr(pytest.Class, "from_parent", pytest.Class)
- 
-         return [
--            pytest.Class(parametrize_cls.__name__, parent=collector)
-+            ctor(name=parametrize_cls.__name__, parent=collector)
-             for parametrize_cls in _parametrize_cls(collector.module, obj)
-         ]
-     elif (
-diff --git a/tox.ini b/tox.ini
-index ed233ee..f144754 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -7,7 +7,7 @@ SQLA_REPO = {env:SQLA_REPO:git+https://github.com/sqlalchemy/sqlalchemy.git}
- [testenv]
- cov_args=--cov=alembic --cov-report term --cov-report xml
- 
--deps=pytest!=3.9.1,!=3.9.2
-+deps=pytest>4.6
-      pytest-xdist
-      mock
-      sqla11: {[tox]SQLA_REPO}@rel_1_1
-@@ -30,7 +30,7 @@ usedevelop=
- # only use --dropfirst option if we're *not* using -n;
- # if -n is used, we're working in brand new DBs anyway
- setenv=
--    BASECOMMAND=python -m pytest
-+    BASECOMMAND=python -m pytest --rootdir {toxinidir}
-     WORKERS=-n4
-     sqla079: WORKERS=--dropfirst
-     cov: COVERAGE={[testenv]cov_args}