fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-07 02:58:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source 
# Conflicts:
#	docs/conf.py
This commit is contained in:
Ilan Steemers
2015-10-28 12:12:03 +01:00
parent f5197ac912 e9969a29c3
commit 282421c534
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.rst
+2 -1
View File
@@ -16,7 +16,7 @@ Features
- Scheduled and repeated tasks - Scheduled and repeated tasks
- Encrypted and compressed packages - Encrypted and compressed packages
- Failure and success database or cache - Failure and success database or cache
- Result hooks and groups - Result hooks, groups and chains
- Django Admin integration - Django Admin integration
- PaaS compatible with multiple instances - PaaS compatible with multiple instances
- Multi cluster monitor - Multi cluster monitor
@@ -201,6 +201,7 @@ Acknowledgements
`RQ <https://github.com/ui/django-rq>`__ `RQ <https://github.com/ui/django-rq>`__
- Human readable hashes by - Human readable hashes by
`HumanHash <https://github.com/zacharyvoase/humanhash>`__ `HumanHash <https://github.com/zacharyvoase/humanhash>`__
- Redditors feedback at `r/django <https://www.reddit.com/r/django/>`__
.. |image0| image:: https://travis-ci.org/Koed00/django-q.svg?branch=master .. |image0| image:: https://travis-ci.org/Koed00/django-q.svg?branch=master
:target: https://travis-ci.org/Koed00/django-q :target: https://travis-ci.org/Koed00/django-q
django_q/__init__.py
+1 -1
View File
@@ -5,7 +5,7 @@ from django import get_version
myPath = os.path.dirname(os.path.abspath(__file__)) myPath = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, myPath) sys.path.insert(0, myPath)
VERSION = (0, 7, 9) VERSION = (0, 7, 10)
default_app_config = 'django_q.apps.DjangoQConfig' default_app_config = 'django_q.apps.DjangoQConfig'
docs/index.rst
+3 -3
View File
@@ -11,12 +11,12 @@ Django Q is a native Django task queue, scheduler and worker application using P
Features Features
-------- --------
- Multiprocessing worker poole7u-CG - Multiprocessing worker pools
- Asynchronous tasks - Asynchronous tasks
- Scheduled and repeated tasks - Scheduled and repeated tasks
- Encrypted and compressed packages - Encrypted and compressed packages
- Failure and success database or cache - Failure and success database or cache
- Result hooks and groups - Result hooks, groups and chains
- Django Admin integration - Django Admin integration
- PaaS compatible with multiple instances - PaaS compatible with multiple instances
- Multi cluster monitor - Multi cluster monitor
@@ -24,7 +24,7 @@ Features
- Python 2 and 3 - Python 2 and 3
Django Q is tested with: Python 2.7 & 3.5. Django 1.7.10 & 1.8.4 Django Q is tested with: Python 2.7 & 3.5. Django 1.7.10 & 1.8.5
Contents: Contents:
setup.py
+1 -1
View File
@@ -26,7 +26,7 @@ class PyTest(Command):
setup( setup(
name='django-q', name='django-q',
version='0.7.9', version='0.7.10',
author='Ilan Steemers', author='Ilan Steemers',
author_email='koed0@gmail.com', author_email='koed0@gmail.com',
keywords='django distributed task queue worker scheduler cron redis disque ironmq sqs orm mongodb multiprocessing', keywords='django distributed task queue worker scheduler cron redis disque ironmq sqs orm mongodb multiprocessing',