gentoo auto-resync : 15:07:2022 - 01:41:14

6 files changed, 13 insertions, 115 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c5d734afefa2..0a40b6814e09 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index 0fb55ebd3090..4c8b37f9f4cd 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,10 +1,5 @@
-AUX python-gitlab-2.10.1-do-not-package-tests.patch 735 BLAKE2B dc0db2642e84bf4a1cda3228f6004916fab65c65e10db4bbf1b20b639753489d6b14479dbf1b21429323f4c2c5c10c9bfda4664f3fa44f093d62a463174f7ad6 SHA512 4d0d493ca1e9806e6d0f3b0ad4e3381918dbebe3f31c2061bb4dc1db9e945ff9de5e3feb75af5ae7e596808ffa95668ec4c142f66565cfb5d87d6a71972dc05c
-DIST python-gitlab-2.10.1.tar.gz 178899 BLAKE2B 5b0fd1552fca15827d9fa12745d035288c4796abbf3b7aeb9f9191a50800641ce0205f551724d8af9ed572b6ebc98052a2411f07b45c23a762fc1b9f713b3b31 SHA512 ab3ca0039ca5fa0b025ffbbe9ee65b1041d02c869f86e8656f6616d4e1dbc3d20898d5cfffcdf0557ad545c40837e4517bffefdbee9948fb366aba7e22d7eb41
-DIST python-gitlab-2.5.0.tar.gz 148916 BLAKE2B f870833a01adac08b71dc402bc11ba9c1be19c920735faf04de9bfca3b1a154706da4bc0475437997e3b03d8c9a56977a6691df05b750d64a1f8b964ecd05612 SHA512 7382f9ea2388c6916f3c7e63df137d73f0fdfb3890a8bbb47e766f3476b6febecd1dcbc588445ae1af1b5f17c9a3e6ed9a931fd9fff010c2c37967eab5440824
-DIST python-gitlab-2.6.0.tar.gz 153577 BLAKE2B 4fa0206faa601061fde257988362eca962c9e20f50e5ad57d602a76618581db646f26b035d4d86b9c460ef75f241fcbcdf360419b2e62ec6f95a664ab237d7d2 SHA512 b63dd4657b44fb484d114ceddc1d67465c17560978a8e6b09a9b14634ae6d80bf864b9b4583ddfc102c27c1082f4a015958c30944a734ec635761af524956fbe
 DIST python-gitlab-3.5.0.tar.gz 225751 BLAKE2B 25efd5de5addde6cdb19307217080213e8f0aa9b189307fe10fb9af55d8db92752794cf71c3e826629f043dd85d6078dbf9e96418d3e96d38209a5a81629d589 SHA512 fdc719f0cb0bf588390f0f6f0ffc4814bb5135156ecbe96cb4b381a7f93606a49773d1e8a34397a0f3b4522c8867704429070bae7bec6cf34b9e713f0a9c9189
-EBUILD python-gitlab-2.10.1.ebuild 898 BLAKE2B 0873b32963f081894899b90fde2a155c21c50052099d6ba0afc31142b8378bc9b61dbd15a7a1bbc3581a23a9f0ec3a82b2c886f39f53db11235e2b90f1ef0c90 SHA512 bc980b4ae5373a818deadc45b6db3ddd7bff03ef94a9485d8fadb89ad83ead0dcff9e7d4bf711ab4c6c5a368f9d4dcd8298db91a2a9c88c7576992ce2af0297d
-EBUILD python-gitlab-2.5.0.ebuild 804 BLAKE2B 6f5ebdb0b2aa68916406be761995a4ef0c02ac4d62a9790f60a7a03a007c5d22a596cd937f98b1b613c48cbcfeafd640d83688760287ad63ca1fa02b90f9b72e SHA512 796675f445b95e875facf3e35d90847cd36b111e57b264df058bc5debec35a3a358840921497d467da0e7b37dc8c1f7c0b96b00fd3a45b141a77d5442a3df803
-EBUILD python-gitlab-2.6.0.ebuild 871 BLAKE2B 32f482401fe23f7ede34d0c356af982281ef73192f9bc0eb0e088f5be0dea91cecb5bc8f9b565765d4c57a72f28523440549c1180c03a1515ef39d7ec5352c53 SHA512 2dcfb1ca31adf2106b37a8d4844af4d3db75b5ed324985064f5a08658b460b8ac091235ce5b51c656bced170abb3f035971a26d121447d74075f477b5d6ae3ca
+DIST python-gitlab-3.6.0.tar.gz 235738 BLAKE2B 4ed26f2d8add0fbfdc52bd8d7f61e06b717a2f8b7995b8c75eaf67a20362c259d0c487177ba695310cff11bb0129e49cb3c0058682488da9b8f61b477c4a07f1 SHA512 b2fe2dd62b76929d3acef0c8fc815b91ac5949af47fa43110d461d541ecd943af2e3c7afc94ad4b396b8d8815b4201a65ef7199bf886f5e5b0419b3d9bff2575
 EBUILD python-gitlab-3.5.0.ebuild 869 BLAKE2B 77baec7dec078b1e1032d2f6bfdd079e00a26345fcd8338c36a68a95be55ffe24026c5ce65be2805e089c0cb41eebb4b139109bce27b8de0945cd703d7414a13 SHA512 3068213ed0e62bb9b887944b57103270114c91162208a0e78aaaac3d40d6ea5e537b22372c0571941d196975b68ba1f2906ab35c41aac937f11fc32a85152441
+EBUILD python-gitlab-3.6.0.ebuild 974 BLAKE2B b0522c5df17e7bbc6b7634ada9fc19cafbd6570293276419fe18169013693aee7021e63ff46983c347b9fb8d8ce575b03dfd8494e6bb67ba00ebfa26ea7e4c66 SHA512 3c367880fd08007797369647b88ef6779816bacf77340488ed5716e4b165cb7f852fa6920b3b009cae1c62f28a7e9f3b8c75e2590f66ca3f29e63663e1d4714d
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-vcs/python-gitlab/files/python-gitlab-2.10.1-do-not-package-tests.patch b/dev-vcs/python-gitlab/files/python-gitlab-2.10.1-do-not-package-tests.patch
deleted file mode 100644
index f1f0c6ca8d3d..000000000000
--- a/dev-vcs/python-gitlab/files/python-gitlab-2.10.1-do-not-package-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 969dccc084e833331fcd26c2a12ddaf448575ab4 Mon Sep 17 00:00:00 2001
-From: Nejc Habjan <hab.nejc@gmail.com>
-Date: Fri, 3 Sep 2021 00:28:18 +0200
-Subject: [PATCH] fix(build): do not package tests in wheel
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 6a05a72..589f9a4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -24,7 +24,7 @@ setup(
-     author_email="gauvain@pocentek.net",
-     license="LGPLv3",
-     url="https://github.com/python-gitlab/python-gitlab",
--    packages=find_packages(),
-+    packages=find_packages(exclude=["tests*"]),
-     install_requires=["requests>=2.25.0", "requests-toolbelt>=0.9.1"],
-     package_data={
-         "gitlab": ["py.typed"],
--- 
-2.32.0
-
diff --git a/dev-vcs/python-gitlab/python-gitlab-2.5.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-2.5.0.ebuild
deleted file mode 100644
index 3640bc378d3f..000000000000
--- a/dev-vcs/python-gitlab/python-gitlab-2.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python command line interface to gitlab API"
-HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="test"
-
-BDEPEND="test? (
-		dev-python/httmock[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r *.rst docs
-}
diff --git a/dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild
deleted file mode 100644
index a622256dbf98..000000000000
--- a/dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python command line interface to gitlab API"
-HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="test"
-
-BDEPEND="test? (
-		dev-python/httmock[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND=">=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r *.rst docs
-}
diff --git a/dev-vcs/python-gitlab/python-gitlab-2.10.1.ebuild b/dev-vcs/python-gitlab/python-gitlab-3.6.0.ebuild
index 5067288cbfbf..85ac20d563aa 100644
--- a/dev-vcs/python-gitlab/python-gitlab-2.10.1.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-3.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Python command line interface to gitlab API"
@@ -18,20 +18,19 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="test"
 
 BDEPEND="test? (
-		dev-python/httmock[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND=">=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+dev-python/coverage[${PYTHON_USEDEP}]
+>=dev-python/pytest-console-scripts-1.3.1[${PYTHON_USEDEP}]
+dev-python/pytest-cov[${PYTHON_USEDEP}]
+>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND=">=dev-python/requests-2.28.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]"
 
-PATCHES=(
-	"${FILESDIR}/${P}"-do-not-package-tests.patch
-)
-
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
 python_install_all() {
 	distutils-r1_python_install_all