Gentoo Archives: gentoo-commits

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