From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- dev-python/libsass/Manifest | 6 +- .../files/libsass-0.19.4_rename_sassc.patch | 64 ---------------------- .../files/libsass-0.20.0_rename_sassc.patch | 64 ++++++++++++++++++++++ dev-python/libsass/libsass-0.19.4.ebuild | 35 ------------ dev-python/libsass/libsass-0.20.0.ebuild | 34 ++++++++++++ 5 files changed, 101 insertions(+), 102 deletions(-) delete mode 100644 dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch create mode 100644 dev-python/libsass/files/libsass-0.20.0_rename_sassc.patch delete mode 100644 dev-python/libsass/libsass-0.19.4.ebuild create mode 100644 dev-python/libsass/libsass-0.20.0.ebuild (limited to 'dev-python/libsass') diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest index d066d65cf587..10168a987b36 100644 --- a/dev-python/libsass/Manifest +++ b/dev-python/libsass/Manifest @@ -1,4 +1,4 @@ -AUX libsass-0.19.4_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d -DIST libsass-0.19.4.tar.gz 315525 BLAKE2B b9a7fe2f42559070a30b2549f74b61fd28a18e842ba25b65c221889d18e319593bd08bfbedf2601cf5510fae33a4e24e96c52117db2290947c979bb1ecd0de53 SHA512 370ac2b4edb0dbf4e5a5b66d7795c6c189894bbe444c25465e922f8a3b435605771f8bb6fc9e25f30e6be889bcf4038d0a05ff2297777c179916de510523e489 -EBUILD libsass-0.19.4.ebuild 889 BLAKE2B 07b3076df860a216606fb41ed0ac9945ec8276d0f747b491dd9145fa2046ac91335280ac7dcb7bd654255fa9c8020062b3c0fa46c8e2b8c753e1847e8cef5425 SHA512 58aaf6275cb095a34b9fe35db415f4f8ec401d19b9e290ed4530f13e35b29b7f201b62dc24fb4a7d4b6bf1f1d1a5644c89e8155226f200866377e9280c725fdb +AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d +DIST libsass-0.20.0.tar.gz 321750 BLAKE2B 215bbe8d4a60d3f6851bfe92a7fb79e58bdf86fa5334a39c7ed051ad2ffc598e59afcb381f6526d25d6e3d021fd5eda51371a6628c01111f8bed42bda9581cb7 SHA512 ad6054f3e02b39730c4680b64d3ed20ba05443c7019c8a7a47ae557a6f52c60be1326a2cf2421f13de0a57a5f37347dffff1146190d1fa0eb8fd985f27ebf7d7 +EBUILD libsass-0.20.0.ebuild 880 BLAKE2B 66d395a96bcf6b2d7f32f73f11bfbce375bbb91963c70a00d70aa7630d95362cfd28c053a5460a75012391dde6ce7adaf249ec16ee10bf76cdcf025a6de7133a SHA512 338af8b62356dd32e51694b85cb06083f18c43394aceb2f9be43d226ac2232132ae91383e9750ebec221d9b3f6c816fa8c819a593da5ed208ef79ab2fc61eb92 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225 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 46efe8700328..000000000000 --- 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/files/libsass-0.20.0_rename_sassc.patch b/dev-python/libsass/files/libsass-0.20.0_rename_sassc.patch new file mode 100644 index 000000000000..46efe8700328 --- /dev/null +++ b/dev-python/libsass/files/libsass-0.20.0_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 deleted file mode 100644 index 0c11aa2e40a6..000000000000 --- 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}" -} diff --git a/dev-python/libsass/libsass-0.20.0.ebuild b/dev-python/libsass/libsass-0.20.0.ebuild new file mode 100644 index 000000000000..6ae285a36e2f --- /dev/null +++ b/dev-python/libsass/libsass-0.20.0.ebuild @@ -0,0 +1,34 @@ +# 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" + +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 ) + +distutils_enable_tests pytest + +python_test() { + "${EPYTHON}" sasstests.py || die "Tests fail with ${EPYTHON}" +} -- cgit v1.2.3