Bumps version to 3.1.1 and updates Changelog

Author: ask

Changelog

@@ -9,7 +9,7 @@
 
 3.1.1
 =====
-:release-date: 2013-11-11 XX:XX X.X UTC
+:release-date: 2013-11-11 07:30 P.M UTC
 
 - Fixed Python 3 compatibility problems.
 
@@ -38,7 +38,8 @@
 
     Fix contributed by Alvaro Vega.
 
-- find_related_module now handles import errors (Issue #226).
+- Autodiscovery now warns instead of propagating import
+  errors (Issue #226).
 
 .. _version-3.1.0:
 

README.rst

@@ -4,7 +4,7 @@
 
 .. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png
 
-:Version: 3.1.0
+:Version: 3.1.1
 :Web: http://celeryproject.org/
 :Download: http://pypi.python.org/pypi/django-celery/
 :Source: http://github.com/celery/django-celery/

djcelery/__init__.py

@@ -5,7 +5,7 @@
 
 import os
 
-VERSION = (3, 1, 0)
+VERSION = (3, 1, 1)
 __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
 __author__ = 'Ask Solem'
 __contact__ = '[email protected]'

djcelery/tests/test_discovery.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
+import warnings
+
 from django.conf import settings
 
 from celery.registry import tasks
@@ -21,10 +23,13 @@ def test_discovery(self):
             self.assertDiscovery()
 
     def test_discovery_with_broken(self):
+        warnings.resetwarnings()
         if 'someapp' in settings.INSTALLED_APPS:
             installed_apps = list(settings.INSTALLED_APPS)
             settings.INSTALLED_APPS = installed_apps + ['xxxnot.aexist']
             try:
-                self.assertRaises(ImportError, autodiscover)
+                with warnings.catch_warnings(record=True) as log:
+                    autodiscover()
+                    self.assertTrue(log)
             finally:
                 settings.INSTALLED_APPS = installed_apps

docs/introduction.rst

@@ -4,7 +4,7 @@
 
 .. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png
 
-:Version: 3.1.0b2
+:Version: 3.1.1
 :Web: http://celeryproject.org/
 :Download: http://pypi.python.org/pypi/django-celery/
 :Source: http://github.com/celery/django-celery/
@@ -13,6 +13,14 @@
 
 --
 
+.. warning::
+
+    **THIS PROJECT IS NO LONGER REQUIRED**
+
+    Please follow the new tutorial at:
+
+    http://docs.celeryproject.org/en/latest/django/first-steps-with-django.html
+
 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 more.

requirements/default.txt

@@ -1 +1 @@
-celery>=3.1
+celery>=3.1.1

setup.cfg

@@ -7,4 +7,4 @@ all_files = 1
 upload-dir = docs/.build/html
 
 [bdist_rpm]
-requires = celery >= 3.1
+requires = celery >= 3.1.1

setup.py

@@ -178,8 +178,7 @@ def extra_args(self):
     data_files=data_files,
     zip_safe=False,
     install_requires=[
-        'pytz>dev',
-        'celery>=3.0.11',
+        'celery>=3.1.1',
     ],
     cmdclass={'test': RunTests,
               'quicktest': QuickRunTests,
@@ -200,15 +199,11 @@ def extra_args(self):
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Programming Language :: Python :: Implementation :: Jython',
     ],
-    entry_points={
-        'console_scripts': ['djcelerymon = djcelery.mon:main'],
-    },
     long_description=long_description,
     **extra
 )