[Python-modules-commits] r21986 - in packages/django-celery/trunk/debian (5 files)

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

    Date: Wednesday, May 30, 2012 @ 09:37:30
  Author: fladi-guest
Revision: 21986

Prepare new upstream and fix FTBFS with webhook tests (Closes: #669473).

Added:
  packages/django-celery/trunk/debian/patches/skip_tests.patch
Modified:
  packages/django-celery/trunk/debian/changelog
  packages/django-celery/trunk/debian/control
  packages/django-celery/trunk/debian/patches/series
  packages/django-celery/trunk/debian/rules

Modified: packages/django-celery/trunk/debian/changelog
===================================================================
--- packages/django-celery/trunk/debian/changelog	2012-05-30 09:03:05 UTC (rev 21985)
+++ packages/django-celery/trunk/debian/changelog	2012-05-30 09:37:30 UTC (rev 21986)
@@ -1,11 +1,15 @@
-django-celery (2.5.1-1) unstable; urgency=low
+django-celery (2.5.5-1) unstable; urgency=low
 
   * New upstream release.
+  * Modify PYTHONPATH for sphinx-build.
+  * Add patch to skip webhooks tests (Closes: #669473).
+  * Bump dependency on python-celery to (>= 2.5.2).
+  * Bump dependency on python-django-picklefield to (>= 0.2.0).
   * Bump Standards-Version to 3.9.3.
   * Update DEP-5 URL to 1.0.
   * Update years in d/copyright.
 
- -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 27 Mar 2012 07:35:06 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 30 May 2012 11:33:34 +0200
 
 django-celery (2.4.2-1) unstable; urgency=low
 

Modified: packages/django-celery/trunk/debian/control
===================================================================
--- packages/django-celery/trunk/debian/control	2012-05-30 09:03:05 UTC (rev 21985)
+++ packages/django-celery/trunk/debian/control	2012-05-30 09:37:30 UTC (rev 21986)
@@ -6,10 +6,10 @@
 Build-Depends: debhelper (>= 7.0.50~),
                docbook-to-man,
                python-all (>= 2.7),
-               python-celery (>=2.4.2),
+               python-celery (>=2.5.2),
                python-django (>= 1.2),
                python-django-nose,
-               python-django-picklefield,
+               python-django-picklefield (>= 0.2.0),
                python-mock,
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg),
@@ -23,9 +23,9 @@
 
 Package: python-django-celery
 Architecture: all
-Depends: python-celery (>= 2.4.2),
+Depends: python-celery (>= 2.5.2),
          python-django (>= 1.2),
-         python-django-picklefield,
+         python-django-picklefield (>= 0.2.0),
          python-pkg-resources,
          ${misc:Depends},
          ${python:Depends}

Modified: packages/django-celery/trunk/debian/patches/series
===================================================================
--- packages/django-celery/trunk/debian/patches/series	2012-05-30 09:03:05 UTC (rev 21985)
+++ packages/django-celery/trunk/debian/patches/series	2012-05-30 09:37:30 UTC (rev 21986)
@@ -1 +1,2 @@
+skip_tests.patch
 fix_dependencies.patch

Added: packages/django-celery/trunk/debian/patches/skip_tests.patch
===================================================================
--- packages/django-celery/trunk/debian/patches/skip_tests.patch	                        (rev 0)
+++ packages/django-celery/trunk/debian/patches/skip_tests.patch	2012-05-30 09:37:30 UTC (rev 21986)
@@ -0,0 +1,42 @@
+Description: disable certain unittests by environment
+ This patch allows to set the environment variable DEB_NETWORK_TESTS to 
+ "disabled" which will cause certain tests that rely on networking 
+ (loopback interface) to be skipped. This is used for the webhook tests
+ by now.
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2012-05-20
+Forwarded: not-needed
+
+--- a/djcelery/tests/test_views.py
++++ b/djcelery/tests/test_views.py
+@@ -1,12 +1,14 @@
+ from __future__ import absolute_import
+ 
+ import sys
++import os
+ 
+ from functools import partial
+ 
+ from django.core.urlresolvers import reverse
+ from django.http import HttpResponse
+ from django.test.testcases import TestCase as DjangoTestCase
++from django.utils.unittest import skipIf
+ from django.template import TemplateDoesNotExist
+ 
+ from anyjson import deserialize
+@@ -120,6 +122,7 @@
+ 
+ class test_webhook_task(ViewTestCase):
+ 
++    @skipIf(os.environ.get("DEB_NETWORK_TESTS", False) == "disabled", "network tests disabled by environment")
+     def test_successful_request(self):
+ 
+         @task_webhook
+@@ -133,6 +136,7 @@
+         self.assertDictContainsSubset({"status": "success", "retval": 20},
+                                       deserialize(response.content))
+ 
++    @skipIf(os.environ.get("DEB_NETWORK_TESTS", False) == "disabled", "network tests disabled by environment")
+     def test_failed_request(self):
+ 
+         @task_webhook

Modified: packages/django-celery/trunk/debian/rules
===================================================================
--- packages/django-celery/trunk/debian/rules	2012-05-30 09:03:05 UTC (rev 21985)
+++ packages/django-celery/trunk/debian/rules	2012-05-30 09:37:30 UTC (rev 21986)
@@ -12,7 +12,7 @@
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	sphinx-build -b html -d .build/.doctrees -N docs .build/html
+	PYTHONPATH=. sphinx-build -b html -d .build/.doctrees -N docs .build/html
 	dh_auto_build
 
 .PHONY: override_dh_compress
@@ -24,7 +24,7 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e; \
 	for python in $(shell pyversions -r); do \
-	  $$python setup.py test ; \
+	  DEB_NETWORK_TESTS=disabled $$python setup.py test ; \
 	done
 endif