From 6baa63a9896f6eac8a0b33e5311328acaa3b9450 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 1 Sep 2018 03:41:34 -0400 Subject: [PATCH] Restore usage of upstream django-celery package. Purge periodic tasks before dumping the database. Signed-off-by: Roberto Rosario --- mayan/apps/common/management/commands/convertdb.py | 2 ++ requirements/base.txt | 3 +-- setup.py | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mayan/apps/common/management/commands/convertdb.py b/mayan/apps/common/management/commands/convertdb.py index f78226f0d6..1c7772955e 100644 --- a/mayan/apps/common/management/commands/convertdb.py +++ b/mayan/apps/common/management/commands/convertdb.py @@ -64,6 +64,8 @@ class Command(management.BaseCommand): ) ) + management.call_command('purgeperiodictasks') + management.call_command( 'dumpdata', all=True, database=options['from'], natural_primary=True, natural_foreign=True, diff --git a/requirements/base.txt b/requirements/base.txt index ce1b862b7a..da50c7a2bc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -5,8 +5,7 @@ celery==3.1.24 django-activity-stream==0.6.5 django-autoadmin==1.1.1 -#django-celery==3.2.1 - Use fork below until patch https://github.com/celery/django-celery/pull/552 is accepted. -https://github.com/mayan-edms/django-celery/zipball/master#egg=django-celery +django-celery==3.2.1 django-colorful==1.2 django-cors-headers==2.2.0 django-downloadview==1.9 diff --git a/setup.py b/setup.py index b42264263e..9956c44be0 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ PyYAML==3.13 celery==3.1.24 django-activity-stream==0.6.5 django-autoadmin==1.1.1 +django-celery==3.2.1 django-colorful==1.2 django-cors-headers==2.2.0 django-downloadview==1.9 @@ -125,10 +126,7 @@ setup( 'Topic :: Internet :: WWW/HTTP :: WSGI :: Application', 'Topic :: Communications :: File Sharing', ], - description='Free Open Source Electronic Document Management System', - dependency_links=[ - "https://github.com/mayan-edms/django-celery/zipball/master#egg=django-celery" - ], + description=mayan.__description__, include_package_data=True, install_requires=install_requires, license='Apache 2.0',