public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/libsass/, dev-python/libsass/files/
@ 2020-01-05 10:10 Joonas Niilola
  0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-01-05 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b7eca17fb4369d77d7f0c4dc8b7cd7fea5d255e1
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Dec 27 14:17:34 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 10:09:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7eca17f

dev-python/libsass: A straightforward binding of libsass for Python

Dependency of qtsass

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/14047
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/libsass/Manifest                        |  1 +
 .../files/libsass-0.19.4_rename_sassc.patch        | 64 ++++++++++++++++++++++
 dev-python/libsass/libsass-0.19.4.ebuild           | 31 +++++++++++
 dev-python/libsass/metadata.xml                    | 13 +++++
 4 files changed, 109 insertions(+)

diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
new file mode 100644
index 00000000000..f033af2141f
--- /dev/null
+++ b/dev-python/libsass/Manifest
@@ -0,0 +1 @@
+DIST libsass-0.19.4.tar.gz 315525 BLAKE2B b9a7fe2f42559070a30b2549f74b61fd28a18e842ba25b65c221889d18e319593bd08bfbedf2601cf5510fae33a4e24e96c52117db2290947c979bb1ecd0de53 SHA512 370ac2b4edb0dbf4e5a5b66d7795c6c189894bbe444c25465e922f8a3b435605771f8bb6fc9e25f30e6be889bcf4038d0a05ff2297777c179916de510523e489

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
new file mode 100644
index 00000000000..46efe870032
--- /dev/null
+++ b/dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch
@@ -0,0 +1,64 @@
+diff --git a/sassc.py b/sassc.py
+deleted file mode 100644
+index 2415342..0000000
+--- a/sassc.py
++++ /dev/null
+@@ -1,15 +0,0 @@
+-import warnings
+-
+-import pysassc
+-
+-
+-def main(*args, **kwargs):
+-    warnings.warn(
+-        'The `sassc` entrypoint is deprecated, please use `pysassc`',
+-        FutureWarning,
+-    ),
+-    return pysassc.main(*args, **kwargs)
+-
+-
+-if __name__ == '__main__':
+-    exit(main())
+diff --git a/sasstests.py b/sasstests.py
+index 1f40a97..7547ab3 100644
+--- a/sasstests.py
++++ b/sasstests.py
+@@ -24,7 +24,6 @@ from werkzeug.wrappers import Response
+ 
+ import pysassc
+ import sass
+-import sassc
+ from sassutils._compat import collections_abc
+ from sassutils.builder import Manifest, build_directory
+ from sassutils.wsgi import SassMiddleware
+@@ -976,7 +975,7 @@ class SasscTestCase(BaseTestCase):
+ 
+     def test_sassc_stdout(self):
+         with pytest.warns(FutureWarning) as warninfo:
+-            exit_code = sassc.main(
++            exit_code = pysassc.main(
+                 ['sassc', 'test/a.scss'],
+                 self.out, self.err,
+             )
+diff --git a/setup.py b/setup.py
+index e2a0c85..5905162 100644
+--- a/setup.py
++++ b/setup.py
+@@ -218,7 +218,7 @@ setup(
+     version=version(),
+     ext_modules=[sass_extension],
+     packages=['sassutils'],
+-    py_modules=['pysassc', 'sass', 'sassc', 'sasstests'],
++    py_modules=['pysassc', 'sass', 'sasstests'],
+     package_data={
+         '': [
+             'README.rst',
+@@ -239,8 +239,6 @@ setup(
+         ],
+         'console_scripts': [
+             ['pysassc = pysassc:main'],
+-            # TODO: remove `sassc` entry (#134)
+-            ['sassc = sassc:main'],
+         ],
+     },
+     install_requires=['six'],

diff --git a/dev-python/libsass/libsass-0.19.4.ebuild b/dev-python/libsass/libsass-0.19.4.ebuild
new file mode 100644
index 00000000000..922bea5d536
--- /dev/null
+++ b/dev-python/libsass/libsass-0.19.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A straightforward binding of libsass for Python"
+HOMEPAGE="https://github.com/sass/libsass-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libsass
+		dev-python/six[${PYTHON_USEDEP}]
+		test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
+
+# Remove sassc, in favour of pysassc, see: https://github.com/sass/libsass-python/issues/134
+# This avoids a file collision with dev-lang/sassc
+PATCHES=( "${FILESDIR}"/${P}_rename_sassc.patch )
+
+python_test() {
+	"${EPYTHON}" sasstests.py || die "Tests fail with ${EPYTHON}"
+}

diff --git a/dev-python/libsass/metadata.xml b/dev-python/libsass/metadata.xml
new file mode 100644
index 00000000000..dd0bd9c021f
--- /dev/null
+++ b/dev-python/libsass/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@riseup.net</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/libsass/, dev-python/libsass/files/
@ 2020-05-02 11:55 James Le Cuirot
  0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2020-05-02 11:55 UTC (permalink / raw
  To: gentoo-commits

commit:     5f56d7572b4b06cda72f66488d9a17be6db50350
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri May  1 16:56:02 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May  2 11:55:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f56d757

dev-python/libsass: cleanup old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/15596
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-python/libsass/Manifest                        |  1 -
 .../files/libsass-0.19.4_rename_sassc.patch        | 64 ----------------------
 dev-python/libsass/libsass-0.19.4.ebuild           | 35 ------------
 3 files changed, 100 deletions(-)

diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 3b9ca53f26a..fa9922776b2 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,2 +1 @@
-DIST libsass-0.19.4.tar.gz 315525 BLAKE2B b9a7fe2f42559070a30b2549f74b61fd28a18e842ba25b65c221889d18e319593bd08bfbedf2601cf5510fae33a4e24e96c52117db2290947c979bb1ecd0de53 SHA512 370ac2b4edb0dbf4e5a5b66d7795c6c189894bbe444c25465e922f8a3b435605771f8bb6fc9e25f30e6be889bcf4038d0a05ff2297777c179916de510523e489
 DIST libsass-0.20.0.tar.gz 321750 BLAKE2B 215bbe8d4a60d3f6851bfe92a7fb79e58bdf86fa5334a39c7ed051ad2ffc598e59afcb381f6526d25d6e3d021fd5eda51371a6628c01111f8bed42bda9581cb7 SHA512 ad6054f3e02b39730c4680b64d3ed20ba05443c7019c8a7a47ae557a6f52c60be1326a2cf2421f13de0a57a5f37347dffff1146190d1fa0eb8fd985f27ebf7d7

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
deleted file mode 100644
index 46efe870032..00000000000
--- a/dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/sassc.py b/sassc.py
-deleted file mode 100644
-index 2415342..0000000
---- a/sassc.py
-+++ /dev/null
-@@ -1,15 +0,0 @@
--import warnings
--
--import pysassc
--
--
--def main(*args, **kwargs):
--    warnings.warn(
--        'The `sassc` entrypoint is deprecated, please use `pysassc`',
--        FutureWarning,
--    ),
--    return pysassc.main(*args, **kwargs)
--
--
--if __name__ == '__main__':
--    exit(main())
-diff --git a/sasstests.py b/sasstests.py
-index 1f40a97..7547ab3 100644
---- a/sasstests.py
-+++ b/sasstests.py
-@@ -24,7 +24,6 @@ from werkzeug.wrappers import Response
- 
- import pysassc
- import sass
--import sassc
- from sassutils._compat import collections_abc
- from sassutils.builder import Manifest, build_directory
- from sassutils.wsgi import SassMiddleware
-@@ -976,7 +975,7 @@ class SasscTestCase(BaseTestCase):
- 
-     def test_sassc_stdout(self):
-         with pytest.warns(FutureWarning) as warninfo:
--            exit_code = sassc.main(
-+            exit_code = pysassc.main(
-                 ['sassc', 'test/a.scss'],
-                 self.out, self.err,
-             )
-diff --git a/setup.py b/setup.py
-index e2a0c85..5905162 100644
---- a/setup.py
-+++ b/setup.py
-@@ -218,7 +218,7 @@ setup(
-     version=version(),
-     ext_modules=[sass_extension],
-     packages=['sassutils'],
--    py_modules=['pysassc', 'sass', 'sassc', 'sasstests'],
-+    py_modules=['pysassc', 'sass', 'sasstests'],
-     package_data={
-         '': [
-             'README.rst',
-@@ -239,8 +239,6 @@ setup(
-         ],
-         'console_scripts': [
-             ['pysassc = pysassc:main'],
--            # TODO: remove `sassc` entry (#134)
--            ['sassc = sassc:main'],
-         ],
-     },
-     install_requires=['six'],

diff --git a/dev-python/libsass/libsass-0.19.4.ebuild b/dev-python/libsass/libsass-0.19.4.ebuild
deleted file mode 100644
index 0c11aa2e40a..00000000000
--- a/dev-python/libsass/libsass-0.19.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A straightforward binding of libsass for Python"
-HOMEPAGE="https://github.com/sass/libsass-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libsass
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-	)"
-
-# Remove sassc, in favour of pysassc, see: https://github.com/sass/libsass-python/issues/134
-# This avoids a file collision with dev-lang/sassc
-PATCHES=( "${FILESDIR}"/${P}_rename_sassc.patch )
-
-python_test() {
-	"${EPYTHON}" sasstests.py || die "Tests fail with ${EPYTHON}"
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-05-02 11:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-02 11:55 [gentoo-commits] repo/gentoo:master commit in: dev-python/libsass/, dev-python/libsass/files/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2020-01-05 10:10 Joonas Niilola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox