qedsoftware · Tomatosoup97 · Sep 5, 2018 · Sep 5, 2018 · Sep 6, 2018 · Sep 6, 2018
diff --git a/.eslintrc b/.eslintrc
@@ -10,12 +10,12 @@
     "sourceType": "module",
     "ecmaFeatures": {
       "jsx": true
-    },
+    }
   },
   "rules": {
     "strict": 0,
     "curly": 0,
-    "quotes": ["warn", "single"],
+    "quotes": ["warn", "single", {"avoidEscape": true}],
     "no-underscore-dangle": 0,
     "camelcase": [0],
     "new-cap": 0,

diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,5 @@ test/compiled/*
 .idea/
 celerybeat-schedule
 deployments.json
-.DS_Store
+.DS_Store
+jsapp/fonts
diff --git a/Dockerfile b/Dockerfile
@@ -127,6 +127,8 @@ RUN ln -s "${KPI_SRC_DIR}/docker/init.bash" /etc/my_init.d/10_init_kpi.bash && \
     ln -s "${KPI_SRC_DIR}/docker/run_uwsgi.bash" /etc/service/uwsgi/run && \
     mkdir -p /etc/service/celery && \
     ln -s "${KPI_SRC_DIR}/docker/run_celery.bash" /etc/service/celery/run && \
+    mkdir -p /etc/service/celery_beat && \
+    ln -s "${KPI_SRC_DIR}/docker/run_celery_beat.bash" /etc/service/celery_beat/run && \
     mkdir -p /etc/service/celery_sync_kobocat_xforms && \
     ln -s "${KPI_SRC_DIR}/docker/run_celery_sync_kobocat_xforms.bash" /etc/service/celery_sync_kobocat_xforms/run
 

diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt
@@ -5,10 +5,10 @@
 #    pip-compile --output-file dependencies/pip/dev_requirements.txt dependencies/pip/dev_requirements.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@d87364f951eb17f321957469a189f8dcb3eab5d1#egg=formpack
--e git+https://github.com/kobotoolbox/pyxform.git@2.018.19#egg=pyxform
+-e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack
 amqp==2.1.4
 anyjson==0.3.3
+argparse==1.4.0           # via unittest2
 asn1crypto==0.24.0        # via cryptography
 begins==0.9
 billiard==3.5.0.2
@@ -21,9 +21,11 @@ cookies==2.2.1            # via responses
 cryptography==2.2.2       # via paramiko, pyopenssl
 cssselect==1.0.3          # via pyquery
 cyordereddict==1.0.0
+defusedxml==0.5.0         # via djangorestframework-xml
 dj-database-url==0.4.2
 dj-static==0.0.6
 django-braces==1.11.0
+django-celery-beat==1.1.1
 django-constance[database]==2.2.0
 django-debug-toolbar==1.6
 django-extensions==1.7.6
@@ -44,11 +46,13 @@ django-taggit==0.22.0
 django-toolbelt==0.0.1
 django-webpack-loader==0.4.1
 django==1.8.17
+djangorestframework-xml==1.3.0
 djangorestframework==3.5.4
 docutils==0.13.1          # via botocore, statistics
 drf-extensions==0.3.1
 enum34==1.1.6             # via cryptography
 fabric==1.13.1
+formencode==1.3.1         # via pyxform
 funcsigs==1.0.2           # via begins, mock
 functools32==3.2.3.post2  # via jsonschema
 futures==3.1.1            # via s3transfer
@@ -59,9 +63,10 @@ jmespath==0.9.3           # via boto3, botocore
 jsonfield==1.0.3
 jsonschema==2.6.0
 kombu==4.0.2
+linecache2==1.0.0         # via traceback2
 lxml==4.2.1
 markdown==2.6.8
-mock==2.0.0               # via responses
+mock==2.0.0
 ndg-httpsclient==0.4.2
 oauthlib==1.1.2
 paramiko==2.1.1           # via fabric
@@ -80,6 +85,7 @@ pytest==3.0.6             # via pytest-django
 python-dateutil==2.6.0
 python-digest==1.7
 pytz==2016.10
+pyxform==0.11.5
 requests==2.13.0
 responses==0.9.0
 s3transfer==0.1.11        # via boto3
@@ -89,7 +95,9 @@ sqlparse==0.2.2
 static3==0.7.0
 statistics==1.0.3.5
 tabulate==0.7.7
+traceback2==1.4.0         # via unittest2
 unicodecsv==0.14.1
+unittest2==1.1.0          # via pyxform
 uwsgi==2.0.17
 vine==1.1.3               # via amqp
 werkzeug==0.11.15

diff --git a/dependencies/pip/external_services.txt b/dependencies/pip/external_services.txt
@@ -5,26 +5,28 @@
 #    pip-compile --output-file dependencies/pip/external_services.txt dependencies/pip/external_services.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@d87364f951eb17f321957469a189f8dcb3eab5d1#egg=formpack
--e git+https://github.com/kobotoolbox/pyxform.git@2.018.19#egg=pyxform
-amqp==1.4.9
+-e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack
+amqp==2.3.2
 anyjson==0.3.3
+argparse==1.4.0           # via unittest2
 asn1crypto==0.24.0        # via cryptography
 begins==0.9
-billiard==3.3.0.23
+billiard==3.5.0.4
 boto3==1.5.8
 boto==2.40.0
 botocore==1.8.22          # via boto3, s3transfer
-celery==3.1.23
+celery==4.2.1
 cffi==1.8.3               # via cryptography
 contextlib2==0.5.4        # via raven
 cookies==2.2.1            # via responses
 cryptography==2.2.2       # via pyopenssl
 cssselect==1.0.3          # via pyquery
 cyordereddict==1.0.0
+defusedxml==0.5.0         # via djangorestframework-xml
 dj-database-url==0.4.1
 dj-static==0.0.6
 django-braces==1.8.1
+django-celery-beat==1.1.1
 django-constance[database]==2.2.0
 django-debug-toolbar==1.4
 django-extensions==1.6.7
@@ -45,10 +47,12 @@ django-taggit==0.22.0
 django-toolbelt==0.0.1
 django-webpack-loader==0.3.0
 django==1.8.13
+djangorestframework-xml==1.3.0
 djangorestframework==3.3.3
 docutils==0.12            # via botocore, statistics
 drf-extensions==0.3.1
 enum34==1.1.6             # via cryptography
+formencode==1.3.1         # via pyxform
 funcsigs==1.0.2           # via begins, mock
 functools32==3.2.3.post2  # via jsonschema
 futures==3.1.1            # via s3transfer
@@ -58,10 +62,11 @@ ipaddress==1.0.17         # via cryptography
 jmespath==0.9.3           # via boto3, botocore
 jsonfield==1.0.3
 jsonschema==2.6.0
-kombu==3.0.35
+kombu==4.2.1
+linecache2==1.0.0         # via traceback2
 lxml==4.2.1
 markdown==2.6.6
-mock==2.0.0               # via responses
+mock==2.0.0
 ndg-httpsclient==0.4.2
 newrelic==2.84.0.64
 oauthlib==1.0.3
@@ -80,6 +85,7 @@ pytest==3.0.3             # via pytest-django
 python-dateutil==2.6.0
 python-digest==1.7
 pytz==2016.4
+pyxform==0.11.5
 raven==5.32.0
 requests==2.10.0
 responses==0.9.0
@@ -90,10 +96,13 @@ sqlparse==0.1.19
 static3==0.7.0
 statistics==1.0.3.5
 tabulate==0.7.5
+traceback2==1.4.0         # via unittest2
 transifex-client==0.11
 unicodecsv==0.14.1
+unittest2==1.1.0          # via pyxform
 urllib3==1.15.1           # via transifex-client
 uwsgi==2.0.17
+vine==1.1.4               # via amqp
 whitenoise==3.3.1
 whoosh==2.7.4
 xlrd==1.1.0

diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in
@@ -1,11 +1,8 @@
 # File for use with `pip-compile`; see https://github.com/nvie/pip-tools
 # https://github.com/bndr/pipreqs is a handy utility, too.
 
-# Custom pyxform
--e git+https://github.com/kobotoolbox/pyxform.git@2.018.19#egg=pyxform
-
 # Formpack
--e git+https://github.com/kobotoolbox/formpack.git@d87364f951eb17f321957469a189f8dcb3eab5d1#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack
 
 # More up-to-date version of django-digest than PyPI seems to have.
 # Also, python-digest is an unlisted dependency thereof.
@@ -24,10 +21,11 @@ anyjson
 billiard
 boto
 boto3
-celery
+celery>=4.0,<5.0
 dj-static
 dj-database-url
 django-braces
+django-celery-beat
 django-constance[database]
 django-debug-toolbar
 django-extensions
@@ -46,17 +44,20 @@ django-taggit
 django-storages
 django-private-storage
 djangorestframework
+djangorestframework-xml
 drf-extensions
 gunicorn
 jsonfield
 kombu
 lxml
+mock
 oauthlib
 psycopg2
 pymongo
 pytest-django
 python-dateutil
 pytz
+pyxform
 requests
 responses
 shortuuid

diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
@@ -5,25 +5,27 @@
 #    pip-compile --output-file dependencies/pip/requirements.txt dependencies/pip/requirements.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@d87364f951eb17f321957469a189f8dcb3eab5d1#egg=formpack
--e git+https://github.com/kobotoolbox/pyxform.git@2.018.19#egg=pyxform
-amqp==1.4.9
+-e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack
+amqp==2.3.2
 anyjson==0.3.3
+argparse==1.4.0           # via unittest2
 asn1crypto==0.24.0        # via cryptography
 begins==0.9
-billiard==3.3.0.23
+billiard==3.5.0.4
 boto3==1.5.8
 boto==2.40.0
 botocore==1.8.22          # via boto3, s3transfer
-celery==3.1.23
+celery==4.2.1
 cffi==1.8.3               # via cryptography
 cookies==2.2.1            # via responses
 cryptography==2.2.2       # via pyopenssl
 cssselect==1.0.3          # via pyquery
 cyordereddict==1.0.0
+defusedxml==0.5.0         # via djangorestframework-xml
 dj-database-url==0.4.1
 dj-static==0.0.6
 django-braces==1.8.1
+django-celery-beat==1.1.1
 django-constance[database]==2.2.0
 django-debug-toolbar==1.4
 django-extensions==1.6.7
@@ -44,10 +46,12 @@ django-taggit==0.22.0
 django-toolbelt==0.0.1
 django-webpack-loader==0.3.0
 django==1.8.13
+djangorestframework-xml==1.3.0
 djangorestframework==3.3.3
 docutils==0.12            # via botocore, statistics
 drf-extensions==0.3.1
 enum34==1.1.6             # via cryptography
+formencode==1.3.1         # via pyxform
 funcsigs==1.0.2           # via begins, mock
 functools32==3.2.3.post2  # via jsonschema
 futures==3.1.1            # via s3transfer
@@ -57,10 +61,11 @@ ipaddress==1.0.17         # via cryptography
 jmespath==0.9.3           # via boto3, botocore
 jsonfield==1.0.3
 jsonschema==2.6.0
-kombu==3.0.35
+kombu==4.2.1
+linecache2==1.0.0         # via traceback2
 lxml==4.2.1
 markdown==2.6.6
-mock==2.0.0               # via responses
+mock==2.0.0
 ndg-httpsclient==0.4.2
 oauthlib==1.0.3
 path.py==11.0.1
@@ -78,6 +83,7 @@ pytest==3.0.3             # via pytest-django
 python-dateutil==2.6.0
 python-digest==1.7
 pytz==2016.4
+pyxform==0.11.5
 requests==2.10.0
 responses==0.9.0
 s3transfer==0.1.11        # via boto3
@@ -87,8 +93,11 @@ sqlparse==0.1.19
 static3==0.7.0
 statistics==1.0.3.5
 tabulate==0.7.5
+traceback2==1.4.0         # via unittest2
 unicodecsv==0.14.1
+unittest2==1.1.0          # via pyxform
 uwsgi==2.0.17
+vine==1.1.4               # via amqp
 whitenoise==3.3.1
 whoosh==2.7.4
 xlrd==1.1.0

diff --git a/docker/run_celery.bash b/docker/run_celery.bash
@@ -4,7 +4,7 @@ source /etc/profile
 
 # Run the main Celery worker (will not process `sync_kobocat_xforms` jobs).
 cd "${KPI_SRC_DIR}"
-exec celery worker -A kobo --beat --loglevel=info \
+exec celery worker -A kobo --loglevel=info \
     --hostname=main_worker@%h \
     --logfile=${KPI_LOGS_DIR}/celery.log \
     --pidfile=/tmp/celery.pid \

diff --git a/docker/run_celery_beat.bash b/docker/run_celery_beat.bash
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+source /etc/profile
+
+# Run the main Celery worker (will not process `sync_kobocat_xforms` jobs).
+cd "${KPI_SRC_DIR}"
+exec celery beat -A kobo --loglevel=info \
+    --logfile=${KPI_LOGS_DIR}/celery_beat.log \
+    --pidfile=/tmp/celery_beat.pid \
+    --scheduler django_celery_beat.schedulers:DatabaseScheduler
diff --git a/docker/run_celery_sync_kobocat_xforms.bash b/docker/run_celery_sync_kobocat_xforms.bash
@@ -12,6 +12,4 @@ exec celery worker -A kobo --loglevel=info \
     --pidfile=/tmp/celery_sync_kobocat_xforms.pid \
     --queues=sync_kobocat_xforms_queue \
     --concurrency=1 \
-    --maxtasksperchild=1
-    # Watch out: this may be changed in 4.x to `--max-tasks-per-child` per
-    # http://docs.celeryproject.org/en/latest/reference/celery.bin.worker.html#cmdoption-celery-worker-max-tasks-per-child
+    --max-tasks-per-child=1
diff --git a/fabfile/__init__.py b/fabfile/__init__.py