Gentoo Archives: gentoo-commits

From: Louis Sautier <sbraz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/coloredlogs/, dev-python/coloredlogs/files/
Date: Mon, 28 Sep 2020 17:03:40
Message-Id: 1601312598.3201627b559b469bc9d1f88140a08586a6f16384.sbraz@gentoo
1 commit: 3201627b559b469bc9d1f88140a08586a6f16384
2 Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 28 16:29:50 2020 +0000
4 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 28 17:03:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3201627b
7
8 dev-python/coloredlogs: bump to 14.0, add PyPy3+Python 3.9 support
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
12
13 dev-python/coloredlogs/Manifest | 1 +
14 dev-python/coloredlogs/coloredlogs-14.0.ebuild | 46 ++++++++++++++++++++++
15 .../coloredlogs-14.0-fix-install-prefix.patch | 35 ++++++++++++++++
16 3 files changed, 82 insertions(+)
17
18 diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
19 index ed2a550127e..7e04c31b3a2 100644
20 --- a/dev-python/coloredlogs/Manifest
21 +++ b/dev-python/coloredlogs/Manifest
22 @@ -1 +1,2 @@
23 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
24 +DIST coloredlogs-14.0.tar.gz 275863 BLAKE2B 0a8c026220955397378ad2b43a69c89c5710a09e2d9ed81a3f25408c60e171f4b8f78239696a0bc1b51fc3dd9bfca80df63e1f1d7afb6bee0046209a089e0d6d SHA512 3434a95f3216d19af5d7a48324e5afd5e975f92d9f6b99f40df2c0a635f1738e0bc6d7277a549a42a0fec5a8601f82908c4b0205ceeb3666f49210f66fe58671
25
26 diff --git a/dev-python/coloredlogs/coloredlogs-14.0.ebuild b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
27 new file mode 100644
28 index 00000000000..89c3d911e9f
29 --- /dev/null
30 +++ b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
31 @@ -0,0 +1,46 @@
32 +# Copyright 1999-2020 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=7
36 +
37 +PYTHON_COMPAT=( pypy3 python3_{6..9} )
38 +
39 +DISTUTILS_USE_SETUPTOOLS=rdepend
40 +
41 +inherit distutils-r1
42 +
43 +DESCRIPTION="Colored stream handler for the logging module"
44 +HOMEPAGE="
45 + https://pypi.org/project/coloredlogs/
46 + https://github.com/xolox/python-coloredlogs
47 + https://coloredlogs.readthedocs.io/en/latest/
48 +"
49 +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
50 +
51 +LICENSE="MIT"
52 +SLOT="0"
53 +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
54 +
55 +RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
56 +BDEPEND="
57 + test? (
58 + dev-python/capturer[${PYTHON_USEDEP}]
59 + dev-python/coverage[${PYTHON_USEDEP}]
60 + dev-python/mock[${PYTHON_USEDEP}]
61 + dev-python/verboselogs[${PYTHON_USEDEP}]
62 + )
63 +"
64 +
65 +PATCHES=( "${FILESDIR}/${P}-fix-install-prefix.patch" )
66 +
67 +distutils_enable_sphinx docs
68 +distutils_enable_tests pytest
69 +
70 +python_test() {
71 + # test_cli_conversion requires the package to be installed
72 + distutils_install_for_testing
73 + # test_auto_install fails because the pth file isn't being loaded
74 + pytest -vv ${PN}/tests.py \
75 + --deselect ${PN}/tests.py::ColoredLogsTestCase::test_auto_install \
76 + || die "Tests fail with ${EPYTHON}"
77 +}
78
79 diff --git a/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch b/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch
80 new file mode 100644
81 index 00000000000..d6b60c3bdf5
82 --- /dev/null
83 +++ b/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch
84 @@ -0,0 +1,35 @@
85 +commit 6f566c799323feb3b8dc2b82e62953040a6a5129
86 +Author: Louis Sautier <sautier.louis@×××××.com>
87 +Date: Sat Sep 26 10:30:37 2020 +0200
88 +
89 + setup.py: use absolute paths for pth files
90 +
91 + On some systems (such as PyPy3 on Gentoo), distutils' `data` path is not
92 + `sys.prefix`, which means that we cannot rely on relative paths.
93 +
94 +diff --git a/setup.py b/setup.py
95 +index 057dd80..7674adc 100755
96 +--- a/setup.py
97 ++++ b/setup.py
98 +@@ -66,9 +66,9 @@ def find_pth_directory():
99 + Determine the correct directory pathname for installing ``*.pth`` files.
100 +
101 + To install a ``*.pth`` file using a source distribution archive (created
102 +- when ``python setup.py sdist`` is called) the relative directory pathname
103 +- ``lib/pythonX.Y/site-packages`` needs to be passed to the ``data_files``
104 +- option to ``setup()``.
105 ++ when ``python setup.py sdist`` is called) the directory pathname
106 ++ ``/usr/lib/pythonX.Y/site-packages`` needs to be passed to the ``data_files``
107 ++ option of ``setup()``.
108 +
109 + Unfortunately this breaks universal wheel archives (created when ``python
110 + setup.py bdist_wheel --universal`` is called) because a specific Python
111 +@@ -81,7 +81,7 @@ def find_pth_directory():
112 + directory without hard coding its location.
113 + """
114 + return ('/' if 'bdist_wheel' in sys.argv
115 +- else os.path.relpath(distutils.sysconfig.get_python_lib(), sys.prefix))
116 ++ else distutils.sysconfig.get_python_lib())
117 +
118 +
119 + setup(name='coloredlogs',