[Python-modules-commits] r32115 - in packages/django-classy-tags/trunk/debian/patches (2 files)

[fladi-guest at users.alioth.debian.org]

    Date: Thursday, April 2, 2015 @ 07:32:31
  Author: fladi-guest
Revision: 32115

Drop django-1.7.patch as compatibility was fixed by upstream.

Modified:
  packages/django-classy-tags/trunk/debian/patches/series
Deleted:
  packages/django-classy-tags/trunk/debian/patches/django-1.7.patch

Deleted: packages/django-classy-tags/trunk/debian/patches/django-1.7.patch
===================================================================
--- packages/django-classy-tags/trunk/debian/patches/django-1.7.patch	2015-04-02 07:31:35 UTC (rev 32114)
+++ packages/django-classy-tags/trunk/debian/patches/django-1.7.patch	2015-04-02 07:32:31 UTC (rev 32115)
@@ -1,26 +0,0 @@
-Description: Initialize Django before tests are run.
- Django 1.7 introduced changes to its start-up sequence. See:
- https://docs.djangoproject.com/en/dev/releases/1.7/#standalone-scripts
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2014-08-21
-Forwarded: https://github.com/ojii/django-classy-tags/pull/20
-
---- a/runtests.py
-+++ b/runtests.py
-@@ -28,6 +28,7 @@
- ROOT_URLCONF = 'runtests'
- 
- def main():
-+    import django
-     from django.conf import settings
-     settings.configure(
-         INSTALLED_APPS = INSTALLED_APPS,
-@@ -44,6 +45,8 @@
- 
-     test_runner = TestRunner(verbosity=1, interactive=False, failfast=False)
-     warnings.simplefilter("ignore")
-+    if django.VERSION >= (1, 7):
-+        django.setup()
-     failures = test_runner.run_tests(['classytags'])
-     sys.exit(failures)
- 

Modified: packages/django-classy-tags/trunk/debian/patches/series
===================================================================
--- packages/django-classy-tags/trunk/debian/patches/series	2015-04-02 07:31:35 UTC (rev 32114)
+++ packages/django-classy-tags/trunk/debian/patches/series	2015-04-02 07:32:31 UTC (rev 32115)
@@ -1,2 +1 @@
 intersphinx.patch
-django-1.7.patch