Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/keyring/files/, dev-python/keyring/
Date: Wed, 27 Nov 2019 23:03:23
Message-Id: 1574895793.3a297fe64a013f975723d362d726d62ed136fde2.chutzpah@gentoo
1 commit: 3a297fe64a013f975723d362d726d62ed136fde2
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Wed Nov 27 23:02:26 2019 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 27 23:03:13 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a297fe6
7
8 dev-python/keyring-19.2.0: Version bump, will add py38 after deps
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.79, Repoman-2.3.18
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 dev-python/keyring/Manifest | 1 +
15 .../keyring/files/keyring-19.1.0-tests.patch | 34 +++++++++++++
16 dev-python/keyring/keyring-19.2.0.ebuild | 57 ++++++++++++++++++++++
17 3 files changed, 92 insertions(+)
18
19 diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
20 index b7c65f965da..4d353aab841 100644
21 --- a/dev-python/keyring/Manifest
22 +++ b/dev-python/keyring/Manifest
23 @@ -1,3 +1,4 @@
24 DIST keyring-13.2.1.tar.gz 43140 BLAKE2B 74272b93ff80a03615879a5f416ad6be1012f22862972a7f400609ea3fb984c45ed2ccb44eca30d253d0d39e0876f1ce25ab9aa6267a06a7c67a17aac27cd31e SHA512 3c15c3415ba4b657b041d2395536fc92ba656dc71f28669235f13a630946ad1b332d1f5b031a55776ce8a2120d3d2601462708f00ee105f46a27cf043c1bd906
25 DIST keyring-15.0.0.tar.gz 42547 BLAKE2B b9200f61fcf227ce82ed05db15b8a03754a2d2f0ee7a32afe4a99a6bb4c511e311d7c529d5173756173622e225ae4fa2fcef6409b21dc3d8735b5e8fab73bd1a SHA512 58001d61bdd442196ec4891000cc532d1dd9b85b18d100d8dde38cf1cf733ef6d6541513d73435dfe41e9cd26c6e34332d518a06a7fbc498b1b8971df6640212
26 DIST keyring-18.0.1.tar.gz 48559 BLAKE2B fb9e8df5ae04b4c1d646b4129cf34d420fd05783724dc2d10fccfaf11ddf1a17048c2695477bc1f4cfcd6d08ed48b6d552d19862a0510d8e12fef4e17b13087b SHA512 62091fc304ff0d4a1dd5db3e1fbae7e02edcb60442f19d7408ba2f115226a8282ff67df55334f019da3cccae858cd5e4b0c0ece22a7c66768bbb85018728be30
27 +DIST keyring-19.2.0.tar.gz 41728 BLAKE2B 24a8f095f4009f37fa6d5e7bc2b12be816a5db2abfa4416fc18203a818296c775fe34a2936a71b191700ad511e01059974aec374aea5ee312507a27bd8be76b8 SHA512 5104423289b9e537e64760afed38e5851766b9c955c0659b078cdaba82813e93922e488b5465157cb930285416feef07c0b559fc49909f58bc85b6f30d55dd75
28
29 diff --git a/dev-python/keyring/files/keyring-19.1.0-tests.patch b/dev-python/keyring/files/keyring-19.1.0-tests.patch
30 new file mode 100644
31 index 00000000000..0e4bdfd1960
32 --- /dev/null
33 +++ b/dev-python/keyring/files/keyring-19.1.0-tests.patch
34 @@ -0,0 +1,34 @@
35 +diff --git a/keyring/tests/test_errors.py b/keyring/tests/test_errors.py
36 +index a90905f..1d5f568 100644
37 +--- a/keyring/tests/test_errors.py
38 ++++ b/keyring/tests/test_errors.py
39 +@@ -1,5 +1,8 @@
40 ++import platform
41 ++import unittest
42 + from unittest import mock
43 +
44 ++import pytest
45 + from keyring import errors
46 +
47 +
48 +@@ -13,6 +16,7 @@ class DeletionDetector:
49 +
50 +
51 + class TestExceptionInfo:
52 ++ @pytest.mark.skipif("pypy" in platform.python_implementation().lower(), reason="broken on pypy")
53 + def test_traceback_not_referenced(self):
54 + """
55 + Ensure that an ExceptionInfo does not keep a reference
56 +diff --git a/tests/test_packaging.py b/tests/test_packaging.py
57 +index 3ede719..4bdfa25 100644
58 +--- a/tests/test_packaging.py
59 ++++ b/tests/test_packaging.py
60 +@@ -1,6 +1,7 @@
61 + import pkg_resources
62 ++import pytest
63 +
64 +-
65 ++@×××××××××××.skip("for some reason we are getting 2 of the same entry point")
66 + def test_entry_point():
67 + """
68 + Keyring provides exactly one 'keyring' console script
69
70 diff --git a/dev-python/keyring/keyring-19.2.0.ebuild b/dev-python/keyring/keyring-19.2.0.ebuild
71 new file mode 100644
72 index 00000000000..452524c6e5d
73 --- /dev/null
74 +++ b/dev-python/keyring/keyring-19.2.0.ebuild
75 @@ -0,0 +1,57 @@
76 +# Copyright 1999-2019 Gentoo Authors
77 +# Distributed under the terms of the GNU General Public License v2
78 +
79 +EAPI=7
80 +
81 +PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
82 +
83 +inherit distutils-r1
84 +
85 +DESCRIPTION="Provides access to the system keyring service"
86 +HOMEPAGE="https://github.com/jaraco/keyring"
87 +SRC_URI="https://github.com/jaraco/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
88 +
89 +SLOT="0"
90 +LICENSE="PSF-2"
91 +KEYWORDS="~amd64 ~arm ~arm64 ~x86"
92 +IUSE="doc test"
93 +
94 +RDEPEND="
95 + dev-python/secretstorage[${PYTHON_USEDEP}]
96 + dev-python/entrypoints[${PYTHON_USEDEP}]
97 +"
98 +BDEPEND="
99 + dev-python/setuptools[${PYTHON_USEDEP}]
100 + test? ( ${RDEPEND} )
101 +"
102 +
103 +RESTRICT="!test? ( test )"
104 +
105 +PATCHES=(
106 + "${FILESDIR}/keyring-19.1.0-tests.patch"
107 +)
108 +
109 +distutils_enable_tests pytest
110 +distutils_enable_sphinx docs \
111 + dev-python/jaraco-packaging dev-python/rst-linker
112 +
113 +python_prepare_all() {
114 + # avoid a setuptools_scm dependency
115 + sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
116 + sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
117 + setup.cfg || die
118 +
119 + # avoid other deps
120 + sed -i -r "$(printf -- 's:[[:space:]]*--%s::;' --doctest-modules --flake8 --black --cov)" \
121 + pytest.ini || die
122 +
123 + distutils-r1_python_prepare_all
124 +}
125 +
126 +python_test() {
127 + # Override pytest options to skip flake8
128 + # Skip an interactive test
129 + pytest -vv --override-ini="addopts=--doctest-modules" \
130 + --ignore ${PN}/tests/backends/test_kwallet.py \
131 + || die "testsuite failed under ${EPYTHON}"
132 +}