Hello community,
here is the log from the commit of package python-django-celery for
openSUSE:Factory checked in at 2012-10-18 22:02:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-celery (Old)
and /work/SRC/openSUSE:Factory/.python-django-celery.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-celery", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-celery/python-django-celery.changes
2012-10-07 19:55:26.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-django-celery.new/python-django-celery.changes
2012-10-18 22:02:53.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Oct 10 16:34:13 UTC 2012 - [email protected]
+
+- Update to 3.0.11:
+ - Now depends on celery 3.0.11.
+ - Now depends on pytz
+ - Fixed Django Admin monitor timezone problem.
+ Events still use timestamps that converts to the timezone of
+ the receiving node, but a proper fix is being worked on that
+ will be part of Celery 3.1
+ - Fixed error in database close mechanism for Oracle.
+ Fix contributed by Dan LaMotte.
+
+-------------------------------------------------------------------
Old:
----
django-celery-3.0.10.tar.bz2
New:
----
django-celery-3.0.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-celery.spec ++++++
--- /var/tmp/diff_new_pack.92Et8s/_old 2012-10-18 22:02:54.000000000 +0200
+++ /var/tmp/diff_new_pack.92Et8s/_new 2012-10-18 22:02:54.000000000 +0200
@@ -20,7 +20,7 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: python-django-celery
-Version: 3.0.10
+Version: 3.0.11
Release: 0
Url: http://celeryproject.org
Summary: Django Celery Integration
@@ -33,9 +33,10 @@
#BuildRequires: python-Sphinx
#BuildRequires: python-sphinxcontrib-issuetracker
BuildRequires: python-django
-Requires: python-celery >= 3.0.10
+Requires: python-celery >= 3.0.11
Requires: python-celerymon
Requires: python-django-picklefield
+Requires: python-tz
%if 0%{?suse_version}
%py_requires
%if 0%{?suse_version} > 1110
++++++ django-celery-3.0.10.tar.bz2 -> django-celery-3.0.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/Changelog
new/django-celery-3.0.11/Changelog
--- old/django-celery-3.0.10/Changelog 2012-09-21 11:29:47.000000000 +0200
+++ new/django-celery-3.0.11/Changelog 2012-10-10 16:09:14.000000000 +0200
@@ -5,7 +5,25 @@
.. contents::
:local:
-.. _version-3.0.10:
+.. _version-3.0.11:
+
+3.0.11
+======
+:release-date: 2012-10-10 02:30 P.M BST
+
+- Now depends on celery 3.0.11.
+
+- Now depends on :mod:`pytz`
+
+- Fixed Django Admin monitor timezone problem.
+
+ Events still use timestamps that converts to the timezone of the receiving
+ node, but a proper fix is being worked on that will be part of Celery 3.1
+
+- Fixed error in database close mechanism for Oracle.
+
+ Fix contributed by Dan LaMotte.
+
3.0.10
======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/PKG-INFO
new/django-celery-3.0.11/PKG-INFO
--- old/django-celery-3.0.10/PKG-INFO 2012-09-21 11:31:54.000000000 +0200
+++ new/django-celery-3.0.11/PKG-INFO 2012-10-10 16:09:49.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: django-celery
-Version: 3.0.10
+Version: 3.0.11
Summary: Django Celery Integration.
Home-page: http://celeryproject.org
Author: Ask Solem
@@ -12,7 +12,7 @@
.. image::
http://cloud.github.com/downloads/celery/celery/celery_128.png
- :Version: 3.0.10
+ :Version: 3.0.11
:Web: http://celeryproject.org/
:Download: http://pypi.python.org/pypi/django-celery/
:Source: http://github.com/celery/django-celery/
@@ -44,12 +44,10 @@
=====================================
=====================================
**Program** **Replace with**
=====================================
=====================================
- ``celeryd`` ``python manage.py celeryd``
- ``celeryctl`` ``python manage.py celeryctl``
- ``celerybeat`` ``python manage.py celerybeat``
- ``camqadm`` ``python manage.py camqadm``
- ``celeryev`` ``python manage.py celeryev``
- ``celeryd-multi`` ``python manage.py
celeryd_multi``
+ ``celery`` ``python manage.py celery``
+ ``celery worker`` ``python manage.py celery
worker``
+ ``celery beat`` ``python manage.py celery beat``
+ ``celery ...`` ``python manage.py celery ...``
=====================================
=====================================
The other main difference is that configuration values are stored in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/README
new/django-celery-3.0.11/README
--- old/django-celery-3.0.10/README 2012-09-21 07:38:45.000000000 +0200
+++ new/django-celery-3.0.11/README 2012-10-10 16:06:10.000000000 +0200
@@ -4,7 +4,7 @@
.. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png
-:Version: 3.0.10
+:Version: 3.0.11
:Web: http://celeryproject.org/
:Download: http://pypi.python.org/pypi/django-celery/
:Source: http://github.com/celery/django-celery/
@@ -36,12 +36,10 @@
===================================== =====================================
**Program** **Replace with**
===================================== =====================================
-``celeryd`` ``python manage.py celeryd``
-``celeryctl`` ``python manage.py celeryctl``
-``celerybeat`` ``python manage.py celerybeat``
-``camqadm`` ``python manage.py camqadm``
-``celeryev`` ``python manage.py celeryev``
-``celeryd-multi`` ``python manage.py celeryd_multi``
+``celery`` ``python manage.py celery``
+``celery worker`` ``python manage.py celery worker``
+``celery beat`` ``python manage.py celery beat``
+``celery ...`` ``python manage.py celery ...``
===================================== =====================================
The other main difference is that configuration values are stored in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/README.rst
new/django-celery-3.0.11/README.rst
--- old/django-celery-3.0.10/README.rst 2012-09-21 07:38:45.000000000 +0200
+++ new/django-celery-3.0.11/README.rst 2012-10-10 16:06:10.000000000 +0200
@@ -4,7 +4,7 @@
.. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png
-:Version: 3.0.10
+:Version: 3.0.11
:Web: http://celeryproject.org/
:Download: http://pypi.python.org/pypi/django-celery/
:Source: http://github.com/celery/django-celery/
@@ -36,12 +36,10 @@
===================================== =====================================
**Program** **Replace with**
===================================== =====================================
-``celeryd`` ``python manage.py celeryd``
-``celeryctl`` ``python manage.py celeryctl``
-``celerybeat`` ``python manage.py celerybeat``
-``camqadm`` ``python manage.py camqadm``
-``celeryev`` ``python manage.py celeryev``
-``celeryd-multi`` ``python manage.py celeryd_multi``
+``celery`` ``python manage.py celery``
+``celery worker`` ``python manage.py celery worker``
+``celery beat`` ``python manage.py celery beat``
+``celery ...`` ``python manage.py celery ...``
===================================== =====================================
The other main difference is that configuration values are stored in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/django_celery.egg-info/PKG-INFO
new/django-celery-3.0.11/django_celery.egg-info/PKG-INFO
--- old/django-celery-3.0.10/django_celery.egg-info/PKG-INFO 2012-09-21
11:31:38.000000000 +0200
+++ new/django-celery-3.0.11/django_celery.egg-info/PKG-INFO 2012-10-10
16:09:32.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: django-celery
-Version: 3.0.10
+Version: 3.0.11
Summary: Django Celery Integration.
Home-page: http://celeryproject.org
Author: Ask Solem
@@ -12,7 +12,7 @@
.. image::
http://cloud.github.com/downloads/celery/celery/celery_128.png
- :Version: 3.0.10
+ :Version: 3.0.11
:Web: http://celeryproject.org/
:Download: http://pypi.python.org/pypi/django-celery/
:Source: http://github.com/celery/django-celery/
@@ -44,12 +44,10 @@
=====================================
=====================================
**Program** **Replace with**
=====================================
=====================================
- ``celeryd`` ``python manage.py celeryd``
- ``celeryctl`` ``python manage.py celeryctl``
- ``celerybeat`` ``python manage.py celerybeat``
- ``camqadm`` ``python manage.py camqadm``
- ``celeryev`` ``python manage.py celeryev``
- ``celeryd-multi`` ``python manage.py
celeryd_multi``
+ ``celery`` ``python manage.py celery``
+ ``celery worker`` ``python manage.py celery
worker``
+ ``celery beat`` ``python manage.py celery beat``
+ ``celery ...`` ``python manage.py celery ...``
=====================================
=====================================
The other main difference is that configuration values are stored in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-celery-3.0.10/django_celery.egg-info/requires.txt
new/django-celery-3.0.11/django_celery.egg-info/requires.txt
--- old/django-celery-3.0.10/django_celery.egg-info/requires.txt
2012-09-21 11:31:38.000000000 +0200
+++ new/django-celery-3.0.11/django_celery.egg-info/requires.txt
2012-10-10 16:09:32.000000000 +0200
@@ -1 +1,2 @@
-celery>=3.0.10
\ No newline at end of file
+pytz
+celery>=3.0.11
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/djcelery/__init__.py
new/django-celery-3.0.11/djcelery/__init__.py
--- old/django-celery-3.0.10/djcelery/__init__.py 2012-09-21
10:09:31.000000000 +0200
+++ new/django-celery-3.0.11/djcelery/__init__.py 2012-10-10
16:05:59.000000000 +0200
@@ -5,7 +5,7 @@
import os
-VERSION = (3, 0, 10)
+VERSION = (3, 0, 11)
__version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
__author__ = "Ask Solem"
__contact__ = "[email protected]"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/djcelery/backends/cache.py
new/django-celery-3.0.11/djcelery/backends/cache.py
--- old/django-celery-3.0.10/djcelery/backends/cache.py 2012-07-07
14:06:38.000000000 +0200
+++ new/django-celery-3.0.11/djcelery/backends/cache.py 2012-10-10
16:05:30.000000000 +0200
@@ -51,7 +51,7 @@
"""Backend using the Django cache framework to store task metadata."""
def __init__(self, *args, **kwargs):
- super(CacheBackend, self).__init__(self, *args, **kwargs)
+ super(CacheBackend, self).__init__(*args, **kwargs)
expires = kwargs.get("expires",
current_app.conf.CELERY_TASK_RESULT_EXPIRES)
if isinstance(expires, timedelta):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/djcelery/loaders.py
new/django-celery-3.0.11/djcelery/loaders.py
--- old/django-celery-3.0.10/djcelery/loaders.py 2012-09-20
14:57:01.000000000 +0200
+++ new/django-celery-3.0.11/djcelery/loaders.py 2012-10-10
13:53:13.000000000 +0200
@@ -78,7 +78,7 @@
close()
except DATABASE_ERRORS, exc:
str_exc = str(exc)
- if "closed" not in str_exc and "not connected" in str_exc:
+ if "closed" not in str_exc and "not connected" not in str_exc:
raise
def close_database(self, **kwargs):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/djcelery/snapshot.py
new/django-celery-3.0.11/djcelery/snapshot.py
--- old/django-celery-3.0.10/djcelery/snapshot.py 2012-09-12
18:12:44.000000000 +0200
+++ new/django-celery-3.0.11/djcelery/snapshot.py 2012-10-10
15:30:57.000000000 +0200
@@ -11,10 +11,10 @@
from celery import states
from celery.events.state import Task
from celery.events.snapshot import Polaroid
-from celery.utils.timeutils import maybe_iso8601
+from celery.utils.timeutils import maybe_iso8601, timezone
from .models import WorkerState, TaskState
-from .utils import make_aware, maybe_make_aware
+from .utils import maybe_make_aware
WORKER_UPDATE_FREQ = 60 # limit worker timestamp write freq.
@@ -27,6 +27,12 @@
timedelta(days=3))
EXPIRE_PENDING = getattr(settings, "CELERYCAM_EXPIRE_PENDING",
timedelta(days=5))
+NOT_SAVED_ATTRIBUTES = frozenset(['name', 'args', 'kwargs', 'eta'])
+
+
+def aware_tstamp(secs):
+ """Event timestamps uses the local timezone."""
+ return timezone.to_local_fallback(datetime.fromtimestamp(secs))
class Camera(Polaroid):
@@ -50,7 +56,7 @@
heartbeat = worker.heartbeats[-1]
except IndexError:
return
- return make_aware(datetime.fromtimestamp(heartbeat))
+ return aware_tstamp(heartbeat)
def handle_worker(self, (hostname, worker)):
last_write, obj = self._last_worker_write[hostname]
@@ -67,15 +73,13 @@
if task.worker and task.worker.hostname:
worker = self.handle_worker((task.worker.hostname, task.worker))
- NOT_SAVED_ATTRIBUTES = ('name', 'args', 'kwargs', 'eta')
defaults = {"name": task.name,
"args": task.args,
"kwargs": task.kwargs,
"eta": maybe_make_aware(maybe_iso8601(task.eta)),
"expires": maybe_make_aware(maybe_iso8601(task.expires)),
"state": task.state,
- "tstamp": make_aware(datetime.fromtimestamp(
- task.timestamp)),
+ "tstamp": aware_tstamp(task.timestamp),
"result": task.result or task.exception,
"traceback": task.traceback,
"runtime": task.runtime,
@@ -83,8 +87,8 @@
# If RECEIVED event is lost, some data is lost as it is stored
# only in RECEIVED event for efficiency. In this case we just
# do not overwrite this fields in TaskState instance row
- [defaults.pop(attr) for attr in NOT_SAVED_ATTRIBUTES
- if defaults[attr] is None]
+ [defaults.pop(attr, None) for attr in NOT_SAVED_ATTRIBUTES
+ if defaults[attr] is None]
return self.update_task(task.state, task_id=uuid, defaults=defaults)
def update_task(self, state, **kwargs):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/docs/changelog.rst
new/django-celery-3.0.11/docs/changelog.rst
--- old/django-celery-3.0.10/docs/changelog.rst 2012-09-21 11:29:47.000000000
+0200
+++ new/django-celery-3.0.11/docs/changelog.rst 2012-10-10 16:09:14.000000000
+0200
@@ -5,7 +5,25 @@
.. contents::
:local:
-.. _version-3.0.10:
+.. _version-3.0.11:
+
+3.0.11
+======
+:release-date: 2012-10-10 02:30 P.M BST
+
+- Now depends on celery 3.0.11.
+
+- Now depends on :mod:`pytz`
+
+- Fixed Django Admin monitor timezone problem.
+
+ Events still use timestamps that converts to the timezone of the receiving
+ node, but a proper fix is being worked on that will be part of Celery 3.1
+
+- Fixed error in database close mechanism for Oracle.
+
+ Fix contributed by Dan LaMotte.
+
3.0.10
======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/docs/introduction.rst
new/django-celery-3.0.11/docs/introduction.rst
--- old/django-celery-3.0.10/docs/introduction.rst 2012-09-21
07:38:40.000000000 +0200
+++ new/django-celery-3.0.11/docs/introduction.rst 2012-10-10
16:06:07.000000000 +0200
@@ -4,7 +4,7 @@
.. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png
-:Version: 3.0.10
+:Version: 3.0.11
:Web: http://celeryproject.org/
:Download: http://pypi.python.org/pypi/django-celery/
:Source: http://github.com/celery/django-celery/
@@ -36,12 +36,10 @@
===================================== =====================================
**Program** **Replace with**
===================================== =====================================
-``celeryd`` ``python manage.py celeryd``
-``celeryctl`` ``python manage.py celeryctl``
-``celerybeat`` ``python manage.py celerybeat``
-``camqadm`` ``python manage.py camqadm``
-``celeryev`` ``python manage.py celeryev``
-``celeryd-multi`` ``python manage.py celeryd_multi``
+``celery`` ``python manage.py celery``
+``celery worker`` ``python manage.py celery worker``
+``celery beat`` ``python manage.py celery beat``
+``celery ...`` ``python manage.py celery ...``
===================================== =====================================
The other main difference is that configuration values are stored in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/requirements/default.txt
new/django-celery-3.0.11/requirements/default.txt
--- old/django-celery-3.0.10/requirements/default.txt 2012-09-21
11:21:34.000000000 +0200
+++ new/django-celery-3.0.11/requirements/default.txt 2012-10-10
14:47:29.000000000 +0200
@@ -1 +1,2 @@
-celery>=3.0.10
+pytz
+celery>=3.0.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/setup.cfg
new/django-celery-3.0.11/setup.cfg
--- old/django-celery-3.0.10/setup.cfg 2012-09-21 11:31:54.000000000 +0200
+++ new/django-celery-3.0.11/setup.cfg 2012-10-10 16:09:49.000000000 +0200
@@ -7,7 +7,8 @@
upload-dir = docs/.build/html
[bdist_rpm]
-requires = celery >= 3.0.10
+requires = celery >= 3.0.11
+ pytz
[egg_info]
tag_build =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-celery-3.0.10/setup.py
new/django-celery-3.0.11/setup.py
--- old/django-celery-3.0.10/setup.py 2012-09-21 11:21:29.000000000 +0200
+++ new/django-celery-3.0.11/setup.py 2012-10-10 14:47:44.000000000 +0200
@@ -173,7 +173,8 @@
scripts=["bin/djcelerymon"],
zip_safe=False,
install_requires=[
- "celery>=3.0.10",
+ "pytz",
+ "celery>=3.0.11",
],
cmdclass={"test": RunTests,
"quicktest": QuickRunTests,
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
