diff options
| -rw-r--r-- | dev-python/keyring/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/keyring/files/keyring-19.1.0-tests.patch | 34 | ||||
| -rw-r--r-- | dev-python/keyring/files/keyring-19.3.0-tests.patch | 26 | ||||
| -rw-r--r-- | dev-python/keyring/keyring-19.3.0.ebuild | 56 |
4 files changed, 0 insertions, 117 deletions
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest index 3ff4aab4a973..f115dc8cb68c 100644 --- a/dev-python/keyring/Manifest +++ b/dev-python/keyring/Manifest @@ -1,2 +1 @@ -DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b diff --git a/dev-python/keyring/files/keyring-19.1.0-tests.patch b/dev-python/keyring/files/keyring-19.1.0-tests.patch deleted file mode 100644 index 0e4bdfd1960e..000000000000 --- a/dev-python/keyring/files/keyring-19.1.0-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/keyring/tests/test_errors.py b/keyring/tests/test_errors.py -index a90905f..1d5f568 100644 ---- a/keyring/tests/test_errors.py -+++ b/keyring/tests/test_errors.py -@@ -1,5 +1,8 @@ -+import platform -+import unittest - from unittest import mock - -+import pytest - from keyring import errors - - -@@ -13,6 +16,7 @@ class DeletionDetector: - - - class TestExceptionInfo: -+ @pytest.mark.skipif("pypy" in platform.python_implementation().lower(), reason="broken on pypy") - def test_traceback_not_referenced(self): - """ - Ensure that an ExceptionInfo does not keep a reference -diff --git a/tests/test_packaging.py b/tests/test_packaging.py -index 3ede719..4bdfa25 100644 ---- a/tests/test_packaging.py -+++ b/tests/test_packaging.py -@@ -1,6 +1,7 @@ - import pkg_resources -+import pytest - -- -+@pytest.mark.skip("for some reason we are getting 2 of the same entry point") - def test_entry_point(): - """ - Keyring provides exactly one 'keyring' console script diff --git a/dev-python/keyring/files/keyring-19.3.0-tests.patch b/dev-python/keyring/files/keyring-19.3.0-tests.patch deleted file mode 100644 index 82cef178c6cb..000000000000 --- a/dev-python/keyring/files/keyring-19.3.0-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/keyring/tests/test_multiprocess.py b/keyring/tests/test_multiprocess.py -index 49af222..8fdd1a3 100644 ---- a/keyring/tests/test_multiprocess.py -+++ b/keyring/tests/test_multiprocess.py -@@ -11,6 +11,11 @@ def subprocess_get(): - keyring.get_password('test_app', 'test_user') - - -+pytestmark = pytest.mark.xfail( -+ platform.system() == 'Linux', reason="#410: keyring discovery fails intermittently" -+) -+ -+ - def test_multiprocess_get(): - proc1 = multiprocessing.Process(target=subprocess_get) - proc1.start() -@@ -23,9 +28,6 @@ def test_multiprocess_get(): - sys.version_info < (3, 8) and platform.system() == 'Darwin', - reason="#281: Prior to 3.8, multiprocess invocation fails", - ) --@pytest.mark.xfail( -- platform.system() == 'Linux', reason="#410: tests fail intermittently" --) - def test_multiprocess_get_after_native_get(): - keyring.get_password('test_app', 'test_user') - test_multiprocess_get() diff --git a/dev-python/keyring/keyring-19.3.0.ebuild b/dev-python/keyring/keyring-19.3.0.ebuild deleted file mode 100644 index 448afd7a7d74..000000000000 --- a/dev-python/keyring/keyring-19.3.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} ) - -inherit distutils-r1 - -DESCRIPTION="Provides access to the system keyring service" -HOMEPAGE="https://github.com/jaraco/keyring" -SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="PSF-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 x86" -IUSE="doc" - -RDEPEND=" - dev-python/secretstorage[${PYTHON_USEDEP}] - dev-python/entrypoints[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{5,6,7}) -" - -PATCHES=( - "${FILESDIR}/keyring-19.1.0-tests.patch" - # https://github.com/jaraco/keyring/commit/411204df606bdf02c99f3360ec033e3c235d5f67 - "${FILESDIR}/keyring-19.3.0-tests.patch" -) - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - dev-python/jaraco-packaging \ - dev-python/rst-linker - -python_prepare_all() { - # avoid setuptools_scm and a bunch of style checker dependencies - sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die - sed -r \ - -e "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \ - -e "/pytest-checkdocs/ d" \ - -e "/pytest-flake8/ d" \ - -e "/pytest-black-multipy/ d" \ - -e "/pytest-cov/ d" \ - -i setup.cfg || die - - # avoid other deps - local -a pytest_params=(doctest-modules flake8 black cov) - sed -r -e "$(printf -- 's:[[:space:]]*--%s:: ;' "${pytest_params[@]}")" \ - -i pytest.ini || die - - rm ${PN}/tests/backends/test_kwallet.py || die - - distutils-r1_python_prepare_all -} |