[Python-modules-commits] r26121 - in packages/django-celery/trunk/debian (7 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Thu Oct 10 08:11:31 UTC 2013
Date: Thursday, October 10, 2013 @ 08:11:30
Author: fladi-guest
Revision: 26121
New upstream release.
Modified:
packages/django-celery/trunk/debian/changelog
packages/django-celery/trunk/debian/compat
packages/django-celery/trunk/debian/control
packages/django-celery/trunk/debian/patches/fix_dependencies.patch
packages/django-celery/trunk/debian/patches/no-issues.patch
packages/django-celery/trunk/debian/patches/skip_tests.patch
packages/django-celery/trunk/debian/rules
Modified: packages/django-celery/trunk/debian/changelog
===================================================================
--- packages/django-celery/trunk/debian/changelog 2013-10-09 20:38:00 UTC (rev 26120)
+++ packages/django-celery/trunk/debian/changelog 2013-10-10 08:11:30 UTC (rev 26121)
@@ -1,9 +1,24 @@
-django-celery (2.5.5-3) UNRELEASED; urgency=low
+django-celery (3.0.23-1) unstable; urgency=low
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:00:42 +0200
+ [ Michael Fladischer ]
+ * New upstream release.
+ * Add python-tz to Depends and Build-Depends.
+ * Bump Standards version to 3.9.4.
+ * Bump Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch
+ and build-indep targets.
+ * Bump dependency on celery to >= 3.0.23.
+ * Refresh patches.
+ * Remove trailing whitespaces from long description.
+ * Point DJANGO_SETTINGS_MODULE to the settings module provided by upstream
+ when building the documentation.
+ * Drop versioned Depends and Build-Depends on python-django as no version
+ prior thos the required one is available in the archives.
+ -- Michael Fladischer <FladischerMichael at fladi.at> Thu, 10 Oct 2013 09:40:09 +0200
+
django-celery (2.5.5-2) unstable; urgency=low
* Do not build issues by default, they need a network connection. Thanks to
Modified: packages/django-celery/trunk/debian/compat
===================================================================
--- packages/django-celery/trunk/debian/compat 2013-10-09 20:38:00 UTC (rev 26120)
+++ packages/django-celery/trunk/debian/compat 2013-10-10 08:11:30 UTC (rev 26121)
@@ -1 +1 @@
-7
+8
Modified: packages/django-celery/trunk/debian/control
===================================================================
--- packages/django-celery/trunk/debian/control 2013-10-09 20:38:00 UTC (rev 26120)
+++ packages/django-celery/trunk/debian/control 2013-10-10 08:11:30 UTC (rev 26121)
@@ -3,19 +3,20 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.0~),
docbook-to-man,
python-all (>= 2.7),
- python-celery (>=2.5.2),
- python-django (>= 1.2),
+ python-celery (>= 3.0.23),
+ python-django,
python-django-nose,
python-django-picklefield (>= 0.2.0),
python-mock,
python-setuptools,
python-sphinx (>= 1.0.7+dfsg),
python-sphinxcontrib.issuetracker,
+ python-tz,
python-unittest2
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
X-Python-Version: >= 2.7
Homepage: http://pypi.python.org/pypi/django-celery/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-celery/trunk/
@@ -23,10 +24,11 @@
Package: python-django-celery
Architecture: all
-Depends: python-celery (>= 2.5.2),
- python-django (>= 1.2),
+Depends: python-celery (>= 3.0.23),
+ python-django,
python-django-picklefield (>= 0.2.0),
python-pkg-resources,
+ python-tz,
${misc:Depends},
${python:Depends}
Description: Celery integration for Django
@@ -36,12 +38,12 @@
.
django-celery provides Celery integration for Django using the Django ORM and
cache backend for storing results, autodiscovery of task modules for
- applications listed in INSTALLED_APPS, and integration of task monitoring
+ applications listed in INSTALLED_APPS, and integration of task monitoring
through the Django admin interface.
.
- Using it in a Django project provides a way to distribute asynchronous tasks
- like sending emails or batch-processing larger datasets to one or more
- separate worker nodes.
+ Using it in a Django project provides a way to distribute asynchronous tasks
+ like sending emails or batch-processing larger datasets to one or more
+ separate worker nodes.
Package: python-django-celery-doc
Section: doc
@@ -54,11 +56,11 @@
.
django-celery provides Celery integration for Django using the Django ORM and
cache backend for storing results, autodiscovery of task modules for
- applications listed in INSTALLED_APPS, and integration of task monitoring
+ applications listed in INSTALLED_APPS, and integration of task monitoring
through the Django admin interface.
.
- Using it in a Django project provides a way to distribute asynchronous tasks
- like sending emails or batch-processing larger datasets to one or more
- separate worker nodes.
+ Using it in a Django project provides a way to distribute asynchronous tasks
+ like sending emails or batch-processing larger datasets to one or more
+ separate worker nodes.
.
This package contains the documentation.
Modified: packages/django-celery/trunk/debian/patches/fix_dependencies.patch
===================================================================
--- packages/django-celery/trunk/debian/patches/fix_dependencies.patch 2013-10-09 20:38:00 UTC (rev 26120)
+++ packages/django-celery/trunk/debian/patches/fix_dependencies.patch 2013-10-10 08:11:30 UTC (rev 26121)
@@ -5,20 +5,6 @@
Forwarded: not-needed
Last-Update: 2011-11-28
---- a/tests/settings.py
-+++ b/tests/settings.py
-@@ -26,10 +26,7 @@
- )
-
- NOSE_ARGS = [os.path.join(here, os.pardir, "djcelery", "tests"),
-- os.environ.get("NOSE_VERBOSE") and "--verbose" or "",
-- "--cover3-package=djcelery",
-- "--cover3-branch",
-- "--cover3-exclude=%s" % ",".join(COVERAGE_EXCLUDE_MODULES)]
-+ os.environ.get("NOSE_VERBOSE") and "--verbose" or ""]
-
- BROKER_HOST = "localhost"
- BROKER_PORT = 5672
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,7 +1,6 @@
@@ -31,20 +17,32 @@
django-nose
--- a/setup.py
+++ b/setup.py
-@@ -102,16 +102,9 @@
+@@ -143,16 +143,9 @@
def extra_args(self):
- toxinidir = os.environ.get("TOXINIDIR", "")
+ toxinidir = os.environ.get('TOXINIDIR', '')
return [
-- "--with-coverage3",
-- "--cover3-xml",
-- "--cover3-xml-file=%s" % (
-- os.path.join(toxinidir, "coverage.xml"), ),
- "--with-xunit",
- "--xunit-file=%s" % (
- os.path.join(toxinidir, "nosetests.xml"), ),
-- "--cover3-html",
-- "--cover3-html-dir=%s" % (
-- os.path.join(toxinidir, "cover"), ),
+- '--with-coverage3',
+- '--cover3-xml',
+- '--cover3-xml-file=%s' % (
+- os.path.join(toxinidir, 'coverage.xml'), ),
+ '--with-xunit',
+ '--xunit-file=%s' % (
+ os.path.join(toxinidir, 'nosetests.xml'), ),
+- '--cover3-html',
+- '--cover3-html-dir=%s' % (
+- os.path.join(toxinidir, 'cover'), ),
]
+--- a/tests/settings.py
++++ b/tests/settings.py
+@@ -38,9 +38,6 @@
+ NOSE_ARGS = [
+ os.path.join(here, os.pardir, 'djcelery', 'tests'),
+ os.environ.get('NOSE_VERBOSE') and '--verbose' or '',
+- '--cover3-package=djcelery',
+- '--cover3-branch',
+- '--cover3-exclude=%s' % ','.join(COVERAGE_EXCLUDE_MODULES),
+ ]
+
+ BROKER_URL = 'amqp://'
Modified: packages/django-celery/trunk/debian/patches/no-issues.patch
===================================================================
--- packages/django-celery/trunk/debian/patches/no-issues.patch 2013-10-09 20:38:00 UTC (rev 26120)
+++ packages/django-celery/trunk/debian/patches/no-issues.patch 2013-10-10 08:11:30 UTC (rev 26121)
@@ -5,16 +5,16 @@
Author: Evgeni Golov <evgeni at debian.org>
Bug-Debian: http://bugs.debian.org/681379
---- django-celery-2.5.5.orig/docs/conf.py
-+++ django-celery-2.5.5/docs/conf.py
-@@ -77,6 +77,7 @@ html_sidebars = {
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -81,6 +81,7 @@
}
### Issuetracker
--issuetracker = "github"
--issuetracker_project = "ask/django-celery"
+-issuetracker = 'github'
+-issuetracker_project = 'celery/django-celery'
-issuetracker_issue_pattern = r'[Ii]ssue #(\d+)'
+if os.environ.get("DEB_BUILD_ISSUES", False) != "disabled":
+ issuetracker = "github"
-+ issuetracker_project = "ask/django-celery"
++ issuetracker_project = "celery/django-celery"
+ issuetracker_issue_pattern = r'[Ii]ssue #(\d+)'
Modified: packages/django-celery/trunk/debian/patches/skip_tests.patch
===================================================================
--- packages/django-celery/trunk/debian/patches/skip_tests.patch 2013-10-09 20:38:00 UTC (rev 26120)
+++ packages/django-celery/trunk/debian/patches/skip_tests.patch 2013-10-10 08:11:30 UTC (rev 26121)
@@ -24,7 +24,7 @@
from django.template import TemplateDoesNotExist
from anyjson import deserialize
-@@ -120,6 +122,7 @@
+@@ -128,6 +130,7 @@
class test_webhook_task(ViewTestCase):
@@ -32,8 +32,8 @@
def test_successful_request(self):
@task_webhook
-@@ -133,6 +136,7 @@
- self.assertDictContainsSubset({"status": "success", "retval": 20},
+@@ -141,6 +144,7 @@
+ self.assertDictContainsSubset({'status': 'success', 'retval': 20},
deserialize(response.content))
+ @skipIf(os.environ.get("DEB_NETWORK_TESTS", False) == "disabled", "network tests disabled by environment")
Modified: packages/django-celery/trunk/debian/rules
===================================================================
--- packages/django-celery/trunk/debian/rules 2013-10-09 20:38:00 UTC (rev 26120)
+++ packages/django-celery/trunk/debian/rules 2013-10-10 08:11:30 UTC (rev 26121)
@@ -12,7 +12,7 @@
.PHONY: override_dh_auto_build
override_dh_auto_build:
- PYTHONPATH=. DEB_BUILD_ISSUES=disabled sphinx-build -b html -d .build/.doctrees -N docs .build/html
+ PYTHONPATH=. DEB_BUILD_ISSUES=disabled DJANGO_SETTINGS_MODULE=tests.settings sphinx-build -b html -d .build/.doctrees -N docs .build/html
dh_auto_build
.PHONY: override_dh_compress
More information about the Python-modules-commits
mailing list