Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/libsass/, dev-python/libsass/files/
Date: Sat, 02 May 2020 11:55:50
Message-Id: 1588420512.5f56d7572b4b06cda72f66488d9a17be6db50350.chewi@gentoo
1 commit: 5f56d7572b4b06cda72f66488d9a17be6db50350
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
3 AuthorDate: Fri May 1 16:56:02 2020 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat May 2 11:55:12 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f56d757
7
8 dev-python/libsass: cleanup old
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
12 Closes: https://github.com/gentoo/gentoo/pull/15596
13 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
14
15 dev-python/libsass/Manifest | 1 -
16 .../files/libsass-0.19.4_rename_sassc.patch | 64 ----------------------
17 dev-python/libsass/libsass-0.19.4.ebuild | 35 ------------
18 3 files changed, 100 deletions(-)
19
20 diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
21 index 3b9ca53f26a..fa9922776b2 100644
22 --- a/dev-python/libsass/Manifest
23 +++ b/dev-python/libsass/Manifest
24 @@ -1,2 +1 @@
25 -DIST libsass-0.19.4.tar.gz 315525 BLAKE2B b9a7fe2f42559070a30b2549f74b61fd28a18e842ba25b65c221889d18e319593bd08bfbedf2601cf5510fae33a4e24e96c52117db2290947c979bb1ecd0de53 SHA512 370ac2b4edb0dbf4e5a5b66d7795c6c189894bbe444c25465e922f8a3b435605771f8bb6fc9e25f30e6be889bcf4038d0a05ff2297777c179916de510523e489
26 DIST libsass-0.20.0.tar.gz 321750 BLAKE2B 215bbe8d4a60d3f6851bfe92a7fb79e58bdf86fa5334a39c7ed051ad2ffc598e59afcb381f6526d25d6e3d021fd5eda51371a6628c01111f8bed42bda9581cb7 SHA512 ad6054f3e02b39730c4680b64d3ed20ba05443c7019c8a7a47ae557a6f52c60be1326a2cf2421f13de0a57a5f37347dffff1146190d1fa0eb8fd985f27ebf7d7
27
28 diff --git a/dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch b/dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch
29 deleted file mode 100644
30 index 46efe870032..00000000000
31 --- a/dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch
32 +++ /dev/null
33 @@ -1,64 +0,0 @@
34 -diff --git a/sassc.py b/sassc.py
35 -deleted file mode 100644
36 -index 2415342..0000000
37 ---- a/sassc.py
38 -+++ /dev/null
39 -@@ -1,15 +0,0 @@
40 --import warnings
41 --
42 --import pysassc
43 --
44 --
45 --def main(*args, **kwargs):
46 -- warnings.warn(
47 -- 'The `sassc` entrypoint is deprecated, please use `pysassc`',
48 -- FutureWarning,
49 -- ),
50 -- return pysassc.main(*args, **kwargs)
51 --
52 --
53 --if __name__ == '__main__':
54 -- exit(main())
55 -diff --git a/sasstests.py b/sasstests.py
56 -index 1f40a97..7547ab3 100644
57 ---- a/sasstests.py
58 -+++ b/sasstests.py
59 -@@ -24,7 +24,6 @@ from werkzeug.wrappers import Response
60 -
61 - import pysassc
62 - import sass
63 --import sassc
64 - from sassutils._compat import collections_abc
65 - from sassutils.builder import Manifest, build_directory
66 - from sassutils.wsgi import SassMiddleware
67 -@@ -976,7 +975,7 @@ class SasscTestCase(BaseTestCase):
68 -
69 - def test_sassc_stdout(self):
70 - with pytest.warns(FutureWarning) as warninfo:
71 -- exit_code = sassc.main(
72 -+ exit_code = pysassc.main(
73 - ['sassc', 'test/a.scss'],
74 - self.out, self.err,
75 - )
76 -diff --git a/setup.py b/setup.py
77 -index e2a0c85..5905162 100644
78 ---- a/setup.py
79 -+++ b/setup.py
80 -@@ -218,7 +218,7 @@ setup(
81 - version=version(),
82 - ext_modules=[sass_extension],
83 - packages=['sassutils'],
84 -- py_modules=['pysassc', 'sass', 'sassc', 'sasstests'],
85 -+ py_modules=['pysassc', 'sass', 'sasstests'],
86 - package_data={
87 - '': [
88 - 'README.rst',
89 -@@ -239,8 +239,6 @@ setup(
90 - ],
91 - 'console_scripts': [
92 - ['pysassc = pysassc:main'],
93 -- # TODO: remove `sassc` entry (#134)
94 -- ['sassc = sassc:main'],
95 - ],
96 - },
97 - install_requires=['six'],
98
99 diff --git a/dev-python/libsass/libsass-0.19.4.ebuild b/dev-python/libsass/libsass-0.19.4.ebuild
100 deleted file mode 100644
101 index 0c11aa2e40a..00000000000
102 --- a/dev-python/libsass/libsass-0.19.4.ebuild
103 +++ /dev/null
104 @@ -1,35 +0,0 @@
105 -# Copyright 1999-2020 Gentoo Authors
106 -# Distributed under the terms of the GNU General Public License v2
107 -
108 -EAPI=7
109 -
110 -PYTHON_COMPAT=( python3_{6,7,8} )
111 -DISTUTILS_USE_SETUPTOOLS=rdepend
112 -
113 -inherit distutils-r1
114 -
115 -DESCRIPTION="A straightforward binding of libsass for Python"
116 -HOMEPAGE="https://github.com/sass/libsass-python"
117 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
118 -
119 -LICENSE="MIT"
120 -SLOT="0"
121 -KEYWORDS="~amd64 ~x86"
122 -
123 -IUSE="test"
124 -RESTRICT="!test? ( test )"
125 -
126 -DEPEND="dev-libs/libsass
127 - dev-python/six[${PYTHON_USEDEP}]
128 - test? (
129 - dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
130 - dev-python/werkzeug[${PYTHON_USEDEP}]
131 - )"
132 -
133 -# Remove sassc, in favour of pysassc, see: https://github.com/sass/libsass-python/issues/134
134 -# This avoids a file collision with dev-lang/sassc
135 -PATCHES=( "${FILESDIR}"/${P}_rename_sassc.patch )
136 -
137 -python_test() {
138 - "${EPYTHON}" sasstests.py || die "Tests fail with ${EPYTHON}"
139 -}