Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Dear release team, I previously applied some self-baked patches for python-django-pyscss to support Django 1.7, but upstream has produced a much nicer patch, which I would like to use instead of the Debian one. Upstream fix is available over here: https://github.com/fusionbox/django-pyscss/commit/fc83133312ef976dd24905136967102351b814ea and was released as part of version 1.0.6 of django-pyscss. So I removed my own patch, and used that, in python-django-pyscss/1.0.3-3 which I just uploaded to Sid. Pleaes unblock python-django-pyscss/1.0.3-3. Cheers, Thomas Goirand (zigo) P.S: Note that upstream has been very insisting that I should upgrade to their latest bug-fix release, version 1.0.6, which I refused because of the freeze, and instead did the above.
diff -Nru python-django-pyscss-1.0.3/debian/changelog python-django-pyscss-1.0.3/debian/changelog --- python-django-pyscss-1.0.3/debian/changelog 2014-10-18 14:47:23.000000000 +0000 +++ python-django-pyscss-1.0.3/debian/changelog 2014-11-11 22:29:40.000000000 +0000 @@ -1,3 +1,12 @@ +python-django-pyscss (1.0.3-3) unstable; urgency=medium + + * Using upstream patch instead of the one I produce: upstrema patch is much + shorter, is Django 1.6 compatible, and avoids using orderedict which isn't + available in Python 2.6 (all of which makes it harder to backport to + Wheezy). + + -- Thomas Goirand <[email protected]> Tue, 11 Nov 2014 22:24:17 +0000 + python-django-pyscss (1.0.3-2) unstable; urgency=medium * Added python-simplejson as build-depends. diff -Nru python-django-pyscss-1.0.3/debian/patches/add-django-1.7-compat.patch python-django-pyscss-1.0.3/debian/patches/add-django-1.7-compat.patch --- python-django-pyscss-1.0.3/debian/patches/add-django-1.7-compat.patch 2014-10-18 14:47:23.000000000 +0000 +++ python-django-pyscss-1.0.3/debian/patches/add-django-1.7-compat.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Add Django 1.7 compat. -Author: Thomas Goirand <[email protected]> -Bug-Debian: https://bugs.debian.org/755628 -Forwarded: no -Last-Update: 2014-09-09 - ---- python-django-pyscss-1.0.1.orig/testproject/runtests.py -+++ python-django-pyscss-1.0.1/testproject/runtests.py -@@ -3,6 +3,10 @@ import os - import sys - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproject.testproject.settings") - -+import django -+if hasattr(django, 'setup'): -+ django.setup() -+ - from django.test.utils import get_runner - from django.conf import settings - diff -Nru python-django-pyscss-1.0.3/debian/patches/fix-storage.prefix-not-found.patch python-django-pyscss-1.0.3/debian/patches/fix-storage.prefix-not-found.patch --- python-django-pyscss-1.0.3/debian/patches/fix-storage.prefix-not-found.patch 2014-10-18 14:47:23.000000000 +0000 +++ python-django-pyscss-1.0.3/debian/patches/fix-storage.prefix-not-found.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -Description: Fix storage.prefix does not exist in Django 1.7 -Author: Thomas Goirand <[email protected]> -Forwarded: no -Last-Update: 2014-09-30 - ---- python-django-pyscss-1.0.3.orig/django_pyscss/utils.py -+++ python-django-pyscss-1.0.3/django_pyscss/utils.py -@@ -1,5 +1,6 @@ - import fnmatch - import os -+import collections - - from django.contrib.staticfiles import finders - -@@ -11,8 +12,16 @@ def find_all_files(glob): - storage objects must implement the File storage API: - https://docs.djangoproject.com/en/dev/ref/files/storage/ - """ -+ found_files = collections.OrderedDict() - for finder in finders.get_finders(): - for path, storage in finder.list([]): -- if fnmatch.fnmatchcase(os.path.join(storage.prefix or '', path), -- glob): -+ if getattr(storage, 'prefix', None): -+ prefixed_path = os.path.join(storage.prefix, path) -+ else: -+ prefixed_path = path -+ -+ if prefixed_path not in found_files: -+ found_files[prefixed_path] = (storage, path) -+ -+ if fnmatch.fnmatchcase(prefixed_path, glob): - yield path, storage diff -Nru python-django-pyscss-1.0.3/debian/patches/make_tests_succeed_on_Django-1.7.patch python-django-pyscss-1.0.3/debian/patches/make_tests_succeed_on_Django-1.7.patch --- python-django-pyscss-1.0.3/debian/patches/make_tests_succeed_on_Django-1.7.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-django-pyscss-1.0.3/debian/patches/make_tests_succeed_on_Django-1.7.patch 2014-11-11 22:29:40.000000000 +0000 @@ -0,0 +1,34 @@ +Description: make tests succeed on Django-1.7 +Author: Matthias Runge <[email protected]> +Date: Fri, 17 Oct 2014 10:47:19 +0200 +Origin: upstream, https://github.com/fusionbox/django-pyscss/commit/fc83133312ef976dd24905136967102351b814ea +Last-Update: 2014-11-12 + +diff --git a/django_pyscss/utils.py b/django_pyscss/utils.py +index 8ff5ad9..d668280 100644 +--- a/django_pyscss/utils.py ++++ b/django_pyscss/utils.py +@@ -13,6 +13,7 @@ def find_all_files(glob): + """ + for finder in finders.get_finders(): + for path, storage in finder.list([]): +- if fnmatch.fnmatchcase(os.path.join(storage.prefix or '', path), ++ if fnmatch.fnmatchcase(os.path.join(getattr(storage, 'prefix', '') ++ or '', path), + glob): + yield path, storage +diff --git a/testproject/runtests.py b/testproject/runtests.py +index 394f24a..09930f0 100644 +--- a/testproject/runtests.py ++++ b/testproject/runtests.py +@@ -3,6 +3,10 @@ + import sys + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproject.testproject.settings") + ++import django ++if hasattr(django, 'setup'): ++ django.setup() ++ + from django.test.utils import get_runner + from django.conf import settings + diff -Nru python-django-pyscss-1.0.3/debian/patches/series python-django-pyscss-1.0.3/debian/patches/series --- python-django-pyscss-1.0.3/debian/patches/series 2014-10-18 14:47:23.000000000 +0000 +++ python-django-pyscss-1.0.3/debian/patches/series 2014-11-11 22:29:40.000000000 +0000 @@ -1,2 +1 @@ -add-django-1.7-compat.patch -fix-storage.prefix-not-found.patch +make_tests_succeed_on_Django-1.7.patch
