From 5403beb351fc1d407c2aba16b75d142d77bf8e36dbf4ab2c2265bf0c6890e513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 5 Apr 2019 11:42:33 +0000 Subject: [PATCH] - Update to 0.18.0: * Add support for previous import path to importer callbacks [#287 #291 by Frankie Dintino] * Add several new cli options [#279 #268 by Frankie Dintino] * Fix compilation on macos mojave [#276 #277 by @asottile] * Use -lc++ link flag when compiling with clang [#270 by Christian Thieme #271 by Anthony Sottile] * Honor strip_extension in SassMiddleware [#274 by Anthony Sottile] * Fix invalid escape sequences [#249 by Anthony Sottile] * Add code of conduct [#251 by Nick Schonning] * Add support for python3.7 and remove testing for python3.4 [#254 by Anthony Sottile] * Add strip_extension option for wsgi / distutils builder [#55 #258 by Anthony Sottile #260 by Morten Brekkevold] * Deprecate sassc (replaced by pysassc). [#262 by Anthony Sottile] * Import abc classes from collections.abc to remove DeprecationWarning [#264 by Gary van der Merwe #265 by Anthony Sottile] * Add ability to specify imports for custom extensions * SassList type gained an additional option bracketed=False to match the upstream changes to the sass_list type. [#184 by Anthony Sottile] * libsass-python has moved to the sass organization! * Sort input files for determinism [#212 by Bernhard M. Wiedemann] * Include LICENSE file in distributions [#216 by Dougal J. Sutherland] * Add a pysassc entry to replace sassc [#218 by Anthony Sottile] * Enable building with dynamic linking [#219 by Marcel Plch] * Always add cwd to import paths [#208 by Anthony Sottile] * Use getfullargspec when available in python 3. [#188 by Thom Wiggers] * Use sass_copy_c_string instead of strdup for portability [#196 by Anthony Sottile] * Use -std=gnu++0x to fix installation under cygwin [#195 #197 by Anthony Sottile] * Correct source map url [#201 #202 by Anthony Sottile] * Remove --watch [#203 by Anthony Sottile] - Remove merged patch reproducible.patch - Do not use bundled libsass OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-libsass?expand=0&rev=8 --- libsass-0.12.3.tar.gz | 3 --- libsass-0.18.0.tar.gz | 3 +++ python-libsass.changes | 31 +++++++++++++++++++++++++++++++ python-libsass.spec | 40 +++++++++++++--------------------------- reproducible.patch | 27 --------------------------- 5 files changed, 47 insertions(+), 57 deletions(-) delete mode 100644 libsass-0.12.3.tar.gz create mode 100644 libsass-0.18.0.tar.gz delete mode 100644 reproducible.patch diff --git a/libsass-0.12.3.tar.gz b/libsass-0.12.3.tar.gz deleted file mode 100644 index 432ebf5..0000000 --- a/libsass-0.12.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:236762af9c693bb72ed92d65ff4a5a77d27af9494b6174fbec7e6308416673b0 -size 295246 diff --git a/libsass-0.18.0.tar.gz b/libsass-0.18.0.tar.gz new file mode 100644 index 0000000..9cb5ec8 --- /dev/null +++ b/libsass-0.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2f386677514f9fc758631328bd318dd3e9d839ad7b6e248ec4535a191bfd271 +size 310499 diff --git a/python-libsass.changes b/python-libsass.changes index a607ae0..21567c1 100644 --- a/python-libsass.changes +++ b/python-libsass.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Apr 5 11:30:38 UTC 2019 - Tomáš Chvátal + +- Update to 0.18.0: + * Add support for previous import path to importer callbacks [#287 #291 by Frankie Dintino] + * Add several new cli options [#279 #268 by Frankie Dintino] + * Fix compilation on macos mojave [#276 #277 by @asottile] + * Use -lc++ link flag when compiling with clang [#270 by Christian Thieme #271 by Anthony Sottile] + * Honor strip_extension in SassMiddleware [#274 by Anthony Sottile] + * Fix invalid escape sequences [#249 by Anthony Sottile] + * Add code of conduct [#251 by Nick Schonning] + * Add support for python3.7 and remove testing for python3.4 [#254 by Anthony Sottile] + * Add strip_extension option for wsgi / distutils builder [#55 #258 by Anthony Sottile #260 by Morten Brekkevold] + * Deprecate sassc (replaced by pysassc). [#262 by Anthony Sottile] + * Import abc classes from collections.abc to remove DeprecationWarning [#264 by Gary van der Merwe #265 by Anthony Sottile] + * Add ability to specify imports for custom extensions + * SassList type gained an additional option bracketed=False to match the upstream changes to the sass_list type. [#184 by Anthony Sottile] + * libsass-python has moved to the sass organization! + * Sort input files for determinism [#212 by Bernhard M. Wiedemann] + * Include LICENSE file in distributions [#216 by Dougal J. Sutherland] + * Add a pysassc entry to replace sassc [#218 by Anthony Sottile] + * Enable building with dynamic linking [#219 by Marcel Plch] + * Always add cwd to import paths [#208 by Anthony Sottile] + * Use getfullargspec when available in python 3. [#188 by Thom Wiggers] + * Use sass_copy_c_string instead of strdup for portability [#196 by Anthony Sottile] + * Use -std=gnu++0x to fix installation under cygwin [#195 #197 by Anthony Sottile] + * Correct source map url [#201 #202 by Anthony Sottile] + * Remove --watch [#203 by Anthony Sottile] +- Remove merged patch reproducible.patch +- Do not use bundled libsass + ------------------------------------------------------------------- Sat Jul 14 12:24:38 UTC 2018 - bwiedemann@suse.com diff --git a/python-libsass.spec b/python-libsass.spec index b2a7711..6dfdb63 100644 --- a/python-libsass.spec +++ b/python-libsass.spec @@ -1,7 +1,7 @@ # # spec file for package python-libsass # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,38 +12,32 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define _name libsass %{?!python_module:%define python_module() python-%{**} python3-%{**}} - Name: python-libsass -Version: 0.12.3 +Version: 0.18.0 Release: 0 Summary: Python binding for libsass License: MIT Group: Development/Languages/Python -Url: https://github.com/dahlia/libsass-python -Source: %{_name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM 0.13.3 https://github.com/sass/libsass-python/pull/212 boo#1041090 -Patch0: reproducible.patch - +URL: https://github.com/sass/libsass-python +Source: https://files.pythonhosted.org/packages/source/l/libsass/libsass-%{version}.tar.gz BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libsass-devel BuildRequires: python-rpm-macros - -# sassc installation required setuptools Requires: python-setuptools Requires: python-six # Both are providing sassc binary with different parameters Conflicts: sassc -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %python_subpackages %description @@ -51,28 +45,20 @@ A straightforward binding of libsass for Python. Compile Sass/SCSS in Python with no Ruby stack at all! %prep -%setup -n %{_name}-%{version} -%patch0 -p1 +%setup -q -n %{_name}-%{version} %build +export SYSTEM_SASS=true %python_build %install +export SYSTEM_SASS=true %python_install -%python_clone %{buildroot}%{_bindir}/sassc -%python_clone %{buildroot}%{_bindir}/sassc.py - %python_expand %fdupes %{buildroot}%{$python_sitearch} -%files %python_files -%defattr(-,root,root) +%files %{python_files} +%python3_only %{_bindir}/pysassc %python3_only %{_bindir}/sassc -%{_bindir}/sassc-%{python_bin_suffix} -%python3_only %{_bindir}/sassc.py -%{_bindir}/sassc.py-%{python_bin_suffix} -%{python_sitearch}/_sass*.so -%{python_sitearch}/sass* -%python3_only %{python_sitearch}/__pycache__/sass* -%{python_sitearch}/libsass-%{version}-py*.egg-info +%{python_sitearch}/* %changelog diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index e3abc65..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 054e4e023addd996e832c6164cd4816a66f6234d Mon Sep 17 00:00:00 2001 -From: "Bernhard M. Wiedemann" -Date: Fri, 21 Jul 2017 05:14:46 +0200 -Subject: [PATCH] Sort input files - -when building packages (e.g. for openSUSE Linux) -(random) filesystem order of input files -influences ordering of functions in the output, -thus without the patch, builds (in disposable VMs) would usually differ. - -See https://reproducible-builds.org/ for why this matters. ---- - setup.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup.py b/setup.py -index 3d7543a..bac0923 100644 ---- a/setup.py -+++ b/setup.py -@@ -141,6 +141,7 @@ def restore_cencode(): - else: - link_flags = ['-fPIC', '-lstdc++'] - -+sources.sort() - sass_extension = Extension( - '_sass', - sources,