Merge pull request #3131 from SEED-platform/3096-upgrade/celery-upper…

…case

upgrade: celery 5.2.2 - keeping uppercase celery variables

README.md

@@ -43,7 +43,7 @@ task manager (Celery) with:
 
 ```
 ./manage.py runserver
-celery -A seed worker -l info -c 4 --maxtasksperchild 1000 --events
+celery -A seed worker -l info -c 4 --max-tasks-per-child 1000 --events
 ```
 
 ### Developer Resources

bin/apitest_start_server.sh

@@ -11,7 +11,7 @@ echo "Saving API data"
 ./manage.py create_test_user_json --username demo@example.com --file ./seed/tests/api/api_test_user.json &> tox_test_user.log
 echo "starting celery"
 free -tm
-celery -A seed worker -l INFO -c 2 -B --events --maxtasksperchild 1000 &> celery_console.log &
+celery -A seed worker -l INFO -c 2 -B --events --max-tasks-per-child 1000 &> celery_console.log &
 echo "starting server"
 echo $(free -tm)
 ./manage.py runserver &

bin/protractor_start_server.sh

@@ -10,7 +10,7 @@ echo "creating default user"
 echo "making SU"
 echo "y" | ./manage.py make_superuser --user demo@example.com &> make_superuser.log
 echo "starting celery"
-celery -A seed worker -l INFO -c 2 -B --events --maxtasksperchild 1000 & &> celery.log
+celery -A seed worker -l INFO -c 2 -B --events --max-tasks-per-child 1000 & &> celery.log
 echo "starting server"
 ./manage.py runserver & &> main.log
 sleep 15

bin/start-seed.sh

@@ -28,7 +28,7 @@ fi
 # Celery
 if [ ! -f $CELERY_PIDFILE ]; then
     printf "Starting Celery\n"
-    celery -A seed worker -l info -c 4 --maxtasksperchild 1000 --events --pidfile=$CELERY_PIDFILE > /tmp/celeryd.log 2>&1 &
+    celery -A seed worker -l info -c 4 --max-tasks-per-child 1000 --events --pidfile=$CELERY_PIDFILE > /tmp/celeryd.log 2>&1 &
 else
     printf "Celery is already running\n"
 fi

bin/start_celery.sh

@@ -2,4 +2,4 @@
 
 WORKERS=$(($(nproc) * 2))
 WORKERS=$(($WORKERS>1?$WORKERS:1))
-celery -A seed worker -l info -c $WORKERS --maxtasksperchild=1000 --events
+celery -A seed worker -l info -c $WORKERS --max-tasks-per-child=1000 --events

docker/start_celery_docker.sh

@@ -20,4 +20,4 @@ if [ -z ${NUMBER_OF_WORKERS} ]; then
 fi
 
 echo "Number of workers will be set to: $NUMBER_OF_WORKERS"
-celery -A seed worker -l info -c $NUMBER_OF_WORKERS --maxtasksperchild 1000 --uid 1000 --events
+celery -A seed worker -l info -c $NUMBER_OF_WORKERS --max-tasks-per-child 1000 --uid 1000 --events

docs/source/aws.rst

@@ -180,7 +180,7 @@ project directory, ``celery`` can be started:
 
 .. code-block:: console
 
-    celery -A seed worker -l INFO -c 2 -B --events --maxtasksperchild 1000
+    celery -A seed worker -l INFO -c 2 -B --events --max-tasks-per-child 1000
 
 .. _Celery: http://www.celeryproject.org/
 

docs/source/linux.rst

@@ -183,7 +183,7 @@ project directory, ``celery`` can be started:
 
 .. code-block:: console
 
-    DJANGO_SETTINGS_MODULE=config.settings.dev celery -A seed worker -l info -c 2 -B --events --maxtasksperchild=1000
+    DJANGO_SETTINGS_MODULE=config.settings.dev celery -A seed worker -l info -c 2 -B --events --max-tasks-per-child=1000
 
 .. _Celery: http://www.celeryproject.org/
 

docs/source/setup_osx.rst

@@ -32,7 +32,7 @@ ready for general development. If this is not the case, skip to Prerequisites.
 * `./manage.py migrate`
 * `./manage.py create_default_user`
 * `./manage.py runserver`
-* `DJANGO_SETTINGS_MODULE=config.settings.dev celery -A seed worker -l info -c 4 --maxtasksperchild=1000 --events`
+* `DJANGO_SETTINGS_MODULE=config.settings.dev celery -A seed worker -l info -c 4 --max-tasks-per-child=1000 --events`
 * navigate to `http://127.0.0.1:8000/app/#/profile/admin` in your browser to add users to organizations
 * main app runs at `127.0.0.1:8000/app`
 

requirements/base.txt

@@ -9,7 +9,7 @@ django-crispy-forms==1.8.1
 psycopg2-binary==2.8.4
 
 # background process management
-celery==4.4.7
+celery==5.2.2
 django-redis-cache==3.0.0
 django-compressor==2.4.1
 django-compressor-autoprefixer==0.1.0