Apply pyxform 1.5.1 upgrade to beta branch

dependencies/pip/prod.txt

@@ -4,107 +4,282 @@
 #
 #    pip-compile dependencies/pip/prod.in
 #
--e git+https://github.com/dimagi/django-digest@52ba7edeb326efd97d5670273bb6fa8b0539e501#egg=django_digest  # via -r dependencies/pip/requirements.in
--e git+https://github.com/jnm/django-storages@s3boto3_accurate_tell#egg=django_storages  # via -r dependencies/pip/requirements.in
--e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest  # via -r dependencies/pip/requirements.in
--e git+https://github.com/dresiu/recaptcha-client-1.0.6-py3@48078f8131e2f3c2054d2099ef48cfe9a5745d0c#egg=recaptcha-client  # via -r dependencies/pip/requirements.in
--e git+https://github.com/kobotoolbox/ssrf-protect@755efe16694273ce66060a51e04f973dc034ca4e#egg=ssrf_protect  # via -r dependencies/pip/requirements.in
-amqp==2.6.0               # via -r dependencies/pip/requirements.in, kombu
-argparse==1.4.0           # via unittest2
-attrs==19.3.0             # via jsonschema
-backports.csv==1.0.7      # via formpack
-begins==0.9               # via formpack
-billiard==3.6.3.0         # via celery
-boto3==1.14.44            # via -r dependencies/pip/requirements.in
-botocore==1.17.44         # via boto3, s3transfer
-celery[redis]==4.4.6      # via -r dependencies/pip/requirements.in, django-celery-beat
-certifi==2020.6.20        # via requests, sentry-sdk
-chardet==3.0.4            # via requests
-cssselect==1.1.0          # via pyquery
-defusedxml==0.6.0         # via djangorestframework-xml
-dict2xml==1.7.0           # via -r dependencies/pip/requirements.in
-dj-database-url==0.5.0    # via -r dependencies/pip/requirements.in
-django-celery-beat==2.0.0  # via -r dependencies/pip/requirements.in
-django-cors-headers==3.4.0  # via -r dependencies/pip/requirements.in
-django-db-readonly==0.6.0  # via -r dependencies/pip/requirements.in
-django-extensions==3.0.3  # via -r dependencies/pip/requirements.in
-django-filter==2.3.0      # via -r dependencies/pip/requirements.in
-django-guardian==2.3.0    # via -r dependencies/pip/requirements.in, djangorestframework-guardian
-django-oauth-toolkit==1.3.2  # via -r dependencies/pip/requirements.in
-django-pure-pagination==0.3.0  # via -r dependencies/pip/requirements.in
-django-redis-sessions==0.6.1  # via -r dependencies/pip/requirements.in
-django-registration-redux==2.8  # via -r dependencies/pip/requirements.in
-django-render-block==0.7  # via django-templated-email
-django-reversion==3.0.1   # via -r dependencies/pip/requirements.in
-django-taggit==1.3.0      # via -r dependencies/pip/requirements.in
-django-templated-email==2.3.0  # via -r dependencies/pip/requirements.in
-django-timezone-field==4.0  # via -r dependencies/pip/requirements.in, django-celery-beat
-django==2.2.14            # via -r dependencies/pip/requirements.in, django-celery-beat, django-cors-headers, django-filter, django-guardian, django-oauth-toolkit, django-render-block, django-reversion, django-storages, django-taggit, django-timezone-field, djangorestframework, djangorestframework-guardian, jsonfield
-djangorestframework-csv==2.1.0  # via -r dependencies/pip/requirements.in
-djangorestframework-guardian==0.3.0  # via -r dependencies/pip/requirements.in
-djangorestframework-jsonp==1.0.2  # via -r dependencies/pip/requirements.in
-djangorestframework-xml==2.0.0  # via -r dependencies/pip/requirements.in
-djangorestframework==3.11.0  # via -r dependencies/pip/requirements.in, djangorestframework-csv, djangorestframework-guardian
-docutils==0.15.2          # via botocore, statistics
-dpath==2.0.1              # via -r dependencies/pip/requirements.in
-ecdsa==0.15               # via tlslite-ng
-elaphe3==0.2.0            # via -r dependencies/pip/requirements.in
-et-xmlfile==1.0.1         # via openpyxl
-formencode==1.3.1         # via pyxform
-git+https://github.com/kobotoolbox/formpack.git@52f77e3519fd1079ce3451f9a5c7c27002e9f3f0#egg=formpack  # via -r dependencies/pip/requirements.in
-future==0.18.2            # via celery
-gdata-python3==3.0.1      # via -r dependencies/pip/requirements.in
-geojson-rewind==0.2.0     # via formpack
-gitdb==4.0.5              # via gitpython
-gitpython==3.1.7          # via transifex-client
-idna==2.10                # via requests
-jdcal==1.4.1              # via openpyxl
-jmespath==0.10.0          # via boto3, botocore
-jsonfield==3.1.0          # via -r dependencies/pip/requirements.in
-jsonschema==3.2.0         # via formpack
-kombu==4.6.11             # via celery
-linecache2==1.0.0         # via traceback2
-lxml==4.5.2               # via -r dependencies/pip/requirements.in, formpack, gdata-python3, pyquery
-markdown==3.2.2           # via -r dependencies/pip/requirements.in
-modilabs-python-utils==0.1.5  # via -r dependencies/pip/requirements.in
-numpy==1.19.0             # via pandas
-oauthlib==3.1.0           # via django-oauth-toolkit
-openpyxl==3.0.4           # via -r dependencies/pip/requirements.in
-pandas==1.0.5             # via -r dependencies/pip/requirements.in
-path.py==12.5.0           # via formpack
-path==15.0.0              # via path.py
-pillow==7.2.0             # via -r dependencies/pip/requirements.in, elaphe3
-psycopg2-binary==2.8.5    # via -r dependencies/pip/requirements.in
-pymongo==3.10.1           # via -r dependencies/pip/requirements.in
-pyquery==1.4.1            # via formpack
-pyrsistent==0.16.0        # via jsonschema
-python-crontab==2.5.1     # via django-celery-beat
-python-dateutil==2.8.1    # via botocore, pandas, python-crontab
-python-slugify==4.0.1     # via transifex-client
-pytz==2020.1              # via -r dependencies/pip/requirements.in, celery, django, django-timezone-field, pandas
-pyxform==0.15.1           # via -r dependencies/pip/requirements.in, formpack
-redis==3.5.3              # via -r dependencies/pip/requirements.in, celery, django-redis-sessions
-requests==2.24.0          # via django-oauth-toolkit, transifex-client
-s3transfer==0.3.3         # via boto3
-https://bitbucket.org/fomcl/savreaderwriter/downloads/savReaderWriter-3.3.0.zip#egg=savreaderwriter  # via -r dependencies/pip/requirements.in
-sentry-sdk==0.16.5        # via -r dependencies/pip/requirements.in
-simplejson==3.17.2        # via -r dependencies/pip/requirements.in
-six==1.15.0               # via django-extensions, django-templated-email, djangorestframework-csv, ecdsa, jsonschema, pyrsistent, python-dateutil, ssrf-protect, transifex-client, unittest2
-smmap==3.0.4              # via gitdb
-sqlparse==0.3.1           # via django
-statistics==1.0.3.5       # via formpack
-text-unidecode==1.3       # via python-slugify
-tlslite-ng==0.7.5         # via gdata-python3
-traceback2==1.4.0         # via unittest2
-transifex-client==0.13.11  # via -r dependencies/pip/requirements.in
-unicodecsv==0.14.1        # via djangorestframework-csv, pyxform
-unittest2==1.1.0          # via pyxform
-urllib3==1.25.9           # via botocore, requests, sentry-sdk, transifex-client
-uwsgi==2.0.19.1           # via -r dependencies/pip/prod.in
-vine==1.3.0               # via amqp, celery
-xlrd==1.2.0               # via -r dependencies/pip/requirements.in, pyxform
-xlsxwriter==1.2.9         # via formpack
-xlwt==1.3.0               # via -r dependencies/pip/requirements.in
+-e git+https://github.com/dimagi/django-digest@52ba7edeb326efd97d5670273bb6fa8b0539e501#egg=django_digest
+    # via -r dependencies/pip/requirements.in
+-e git+https://github.com/jnm/django-storages@s3boto3_accurate_tell#egg=django_storages
+    # via -r dependencies/pip/requirements.in
+-e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest
+    # via -r dependencies/pip/requirements.in
+-e git+https://github.com/dresiu/recaptcha-client-1.0.6-py3@48078f8131e2f3c2054d2099ef48cfe9a5745d0c#egg=recaptcha-client
+    # via -r dependencies/pip/requirements.in
+-e git+https://github.com/kobotoolbox/ssrf-protect@755efe16694273ce66060a51e04f973dc034ca4e#egg=ssrf_protect
+    # via -r dependencies/pip/requirements.in
+amqp==2.6.0
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   kombu
+argparse==1.4.0
+    # via unittest2
+attrs==19.3.0
+    # via jsonschema
+backports.csv==1.0.7
+    # via formpack
+begins==0.9
+    # via formpack
+billiard==3.6.3.0
+    # via celery
+boto3==1.14.44
+    # via -r dependencies/pip/requirements.in
+botocore==1.17.44
+    # via
+    #   boto3
+    #   s3transfer
+celery[redis]==4.4.6
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   django-celery-beat
+certifi==2020.6.20
+    # via
+    #   requests
+    #   sentry-sdk
+chardet==3.0.4
+    # via requests
+cssselect==1.1.0
+    # via pyquery
+defusedxml==0.6.0
+    # via djangorestframework-xml
+dict2xml==1.7.0
+    # via -r dependencies/pip/requirements.in
+dj-database-url==0.5.0
+    # via -r dependencies/pip/requirements.in
+django-celery-beat==2.0.0
+    # via -r dependencies/pip/requirements.in
+django-cors-headers==3.4.0
+    # via -r dependencies/pip/requirements.in
+django-db-readonly==0.6.0
+    # via -r dependencies/pip/requirements.in
+django-extensions==3.0.3
+    # via -r dependencies/pip/requirements.in
+django-filter==2.3.0
+    # via -r dependencies/pip/requirements.in
+django-guardian==2.3.0
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   djangorestframework-guardian
+django-oauth-toolkit==1.3.2
+    # via -r dependencies/pip/requirements.in
+django-pure-pagination==0.3.0
+    # via -r dependencies/pip/requirements.in
+django-redis-sessions==0.6.1
+    # via -r dependencies/pip/requirements.in
+django-registration-redux==2.8
+    # via -r dependencies/pip/requirements.in
+django-render-block==0.7
+    # via django-templated-email
+django-reversion==3.0.1
+    # via -r dependencies/pip/requirements.in
+django-taggit==1.3.0
+    # via -r dependencies/pip/requirements.in
+django-templated-email==2.3.0
+    # via -r dependencies/pip/requirements.in
+django-timezone-field==4.0
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   django-celery-beat
+django==2.2.14
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   django-celery-beat
+    #   django-cors-headers
+    #   django-filter
+    #   django-guardian
+    #   django-oauth-toolkit
+    #   django-render-block
+    #   django-reversion
+    #   django-storages
+    #   django-taggit
+    #   django-timezone-field
+    #   djangorestframework
+    #   djangorestframework-guardian
+    #   jsonfield
+djangorestframework-csv==2.1.0
+    # via -r dependencies/pip/requirements.in
+djangorestframework-guardian==0.3.0
+    # via -r dependencies/pip/requirements.in
+djangorestframework-jsonp==1.0.2
+    # via -r dependencies/pip/requirements.in
+djangorestframework-xml==2.0.0
+    # via -r dependencies/pip/requirements.in
+djangorestframework==3.11.0
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   djangorestframework-csv
+    #   djangorestframework-guardian
+docutils==0.15.2
+    # via
+    #   botocore
+    #   statistics
+dpath==2.0.1
+    # via -r dependencies/pip/requirements.in
+ecdsa==0.15
+    # via tlslite-ng
+elaphe3==0.2.0
+    # via -r dependencies/pip/requirements.in
+et-xmlfile==1.0.1
+    # via openpyxl
+formencode==1.3.1
+    # via pyxform
+git+https://github.com/kobotoolbox/formpack.git@52f77e3519fd1079ce3451f9a5c7c27002e9f3f0#egg=formpack
+    # via -r dependencies/pip/requirements.in
+future==0.18.2
+    # via celery
+gdata-python3==3.0.1
+    # via -r dependencies/pip/requirements.in
+geojson-rewind==0.2.0
+    # via formpack
+gitdb==4.0.5
+    # via gitpython
+gitpython==3.1.7
+    # via transifex-client
+idna==2.10
+    # via requests
+jdcal==1.4.1
+    # via openpyxl
+jmespath==0.10.0
+    # via
+    #   boto3
+    #   botocore
+jsonfield==3.1.0
+    # via -r dependencies/pip/requirements.in
+jsonschema==3.2.0
+    # via formpack
+kombu==4.6.11
+    # via celery
+linecache2==1.0.0
+    # via traceback2
+lxml==4.5.2
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   formpack
+    #   gdata-python3
+    #   pyquery
+markdown==3.2.2
+    # via -r dependencies/pip/requirements.in
+modilabs-python-utils==0.1.5
+    # via -r dependencies/pip/requirements.in
+numpy==1.19.0
+    # via pandas
+oauthlib==3.1.0
+    # via django-oauth-toolkit
+openpyxl==3.0.4
+    # via -r dependencies/pip/requirements.in
+pandas==1.0.5
+    # via -r dependencies/pip/requirements.in
+path.py==12.5.0
+    # via formpack
+path==15.0.0
+    # via path.py
+pillow==7.2.0
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   elaphe3
+psycopg2-binary==2.8.5
+    # via -r dependencies/pip/requirements.in
+pymongo==3.10.1
+    # via -r dependencies/pip/requirements.in
+pyquery==1.4.1
+    # via formpack
+pyrsistent==0.16.0
+    # via jsonschema
+python-crontab==2.5.1
+    # via django-celery-beat
+python-dateutil==2.8.1
+    # via
+    #   botocore
+    #   pandas
+    #   python-crontab
+python-slugify==4.0.1
+    # via transifex-client
+pytz==2020.1
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   celery
+    #   django
+    #   django-timezone-field
+    #   pandas
+pyxform==1.5.1
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   formpack
+redis==3.5.3
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   celery
+    #   django-redis-sessions
+requests==2.24.0
+    # via
+    #   django-oauth-toolkit
+    #   transifex-client
+s3transfer==0.3.3
+    # via boto3
+https://bitbucket.org/fomcl/savreaderwriter/downloads/savReaderWriter-3.3.0.zip#egg=savreaderwriter
+    # via -r dependencies/pip/requirements.in
+sentry-sdk==0.16.5
+    # via -r dependencies/pip/requirements.in
+simplejson==3.17.2
+    # via -r dependencies/pip/requirements.in
+six==1.15.0
+    # via
+    #   django-extensions
+    #   django-templated-email
+    #   djangorestframework-csv
+    #   ecdsa
+    #   jsonschema
+    #   pyrsistent
+    #   python-dateutil
+    #   ssrf-protect
+    #   transifex-client
+    #   unittest2
+smmap==3.0.4
+    # via gitdb
+sqlparse==0.3.1
+    # via django
+statistics==1.0.3.5
+    # via formpack
+text-unidecode==1.3
+    # via python-slugify
+tlslite-ng==0.7.5
+    # via gdata-python3
+traceback2==1.4.0
+    # via unittest2
+transifex-client==0.13.11
+    # via -r dependencies/pip/requirements.in
+unicodecsv==0.14.1
+    # via
+    #   djangorestframework-csv
+    #   pyxform
+unittest2==1.1.0
+    # via pyxform
+urllib3==1.25.9
+    # via
+    #   botocore
+    #   requests
+    #   sentry-sdk
+    #   transifex-client
+uwsgi==2.0.19.1
+    # via -r dependencies/pip/prod.in
+vine==1.3.0
+    # via
+    #   amqp
+    #   celery
+xlrd==1.2.0
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   pyxform
+xlsxwriter==1.2.9
+    # via formpack
+xlwt==1.3.0
+    # via -r dependencies/pip/requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

dependencies/pip/requirements.in

@@ -37,7 +37,7 @@ Pillow
 psycopg2-binary
 pymongo
 lxml
-pyxform==0.15.1  # same version as KPI. issues with 1.1.0
+pyxform
 django-reversion<3.0.2
 xlrd
 xlwt