Upgrade formpack (and pyxform to resolve conflicts)

Fixes #1556
kobotoolbox · Feb 11, 2018 · 7a67857 · 7a67857
1 parent b6ec223
commit 7a67857
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt
@@ -5,8 +5,8 @@
 #    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@07d87f04f4f4bab0b7ed6794325933e98811286f#egg=formpack
--e git+https://github.com/kobotoolbox/pyxform.git@2.017.36#egg=pyxform
+-e git+https://github.com/kobotoolbox/formpack.git@c4fc418f46913d5e326b7fe63fa9b720c290a0f1#egg=formpack
+-e git+https://github.com/kobotoolbox/pyxform.git@2.018.06#egg=pyxform
 amqp==2.1.4
 anyjson==0.3.3
 begins==0.9
@@ -44,34 +44,34 @@ djangorestframework==3.5.4
 docutils==0.13.1          # via botocore, statistics
 drf-extensions==0.3.1
 enum34==1.1.6             # via cryptography
+et-xmlfile==1.0.1         # via openpyxl
 fabric==1.13.1
 funcsigs==1.0.2           # via begins
 functools32==3.2.3.post2  # via jsonschema
 futures==3.1.1            # via s3transfer
 gunicorn==19.6.0
 idna==2.2                 # via cryptography
 ipaddress==1.0.18         # via cryptography
-jinja2==2.9.5             # via pyexcelerate
+jdcal==1.3                # via openpyxl
 jmespath==0.9.3           # via boto3, botocore
 jsonfield==1.0.3
-jsonschema==2.5.1
+jsonschema==2.6.0
 kombu==4.0.2
-lxml==2.3.4
+lxml==4.1.1
 markdown==2.6.8
-markupsafe==0.23          # via jinja2
 ndg-httpsclient==0.4.2
 oauthlib==1.1.2
+openpyxl==2.5.0
 paramiko==2.1.1           # via fabric
-path.py==8.1.2
+path.py==10.5
 psycopg2==2.7.3.2
 py==1.4.32                # via pytest
 pyasn1==0.2.2
 pycparser==2.17           # via cffi
-pyexcelerate==0.6.7
 pygments==2.2.0
 pymongo==3.4.0
 pyopenssl==16.2.0
-pyquery==1.2.11
+pyquery==1.4.0
 pytest-django==3.1.2
 pytest==3.0.6             # via pytest-django
 python-dateutil==2.6.0
@@ -91,5 +91,5 @@ vine==1.1.3               # via amqp
 werkzeug==0.11.15
 whitenoise==3.3.1
 whoosh==2.7.4
-xlrd==0.8.0
+xlrd==1.1.0
 xlwt==1.2.0
diff --git a/dependencies/pip/external_services.txt b/dependencies/pip/external_services.txt
@@ -5,8 +5,8 @@
 #    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@07d87f04f4f4bab0b7ed6794325933e98811286f#egg=formpack
--e git+https://github.com/kobotoolbox/pyxform.git@2.017.36#egg=pyxform
+-e git+https://github.com/kobotoolbox/formpack.git@c4fc418f46913d5e326b7fe63fa9b720c290a0f1#egg=formpack
+-e git+https://github.com/kobotoolbox/pyxform.git@2.018.06#egg=pyxform
 amqp==1.4.9
 anyjson==0.3.3
 begins==0.9
@@ -45,33 +45,33 @@ djangorestframework==3.3.3
 docutils==0.12            # via botocore, statistics
 drf-extensions==0.3.1
 enum34==1.1.6             # via cryptography
+et-xmlfile==1.0.1         # via openpyxl
 funcsigs==1.0.2           # via begins
 functools32==3.2.3.post2  # via jsonschema
 futures==3.1.1            # via s3transfer
 gunicorn==19.4.5
 idna==2.1                 # via cryptography
 ipaddress==1.0.17         # via cryptography
-jinja2==2.8               # via pyexcelerate
+jdcal==1.3                # via openpyxl
 jmespath==0.9.3           # via boto3, botocore
 jsonfield==1.0.3
-jsonschema==2.5.1
+jsonschema==2.6.0
 kombu==3.0.35
-lxml==2.3.4
+lxml==4.1.1
 markdown==2.6.6
-markupsafe==0.23          # via jinja2
 ndg-httpsclient==0.4.2
 newrelic==2.84.0.64
 oauthlib==1.0.3
-path.py==8.1.2
+openpyxl==2.5.0
+path.py==10.5
 psycopg2==2.7.3.2
 py==1.4.31                # via pytest
 pyasn1==0.1.9
 pycparser==2.14           # via cffi
-pyexcelerate==0.6.7
 pygments==2.1.3
 pymongo==3.3.0
 pyopenssl==16.1.0
-pyquery==1.2.11
+pyquery==1.4.0
 pytest-django==3.0.0
 pytest==3.0.3             # via pytest-django
 python-dateutil==2.6.0
@@ -92,5 +92,5 @@ urllib3==1.15.1           # via transifex-client
 uwsgi==2.0.13
 whitenoise==3.3.1
 whoosh==2.7.4
-xlrd==0.8.0
+xlrd==1.1.0
 xlwt==1.0.0
diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in
@@ -2,10 +2,10 @@
 # https://github.com/bndr/pipreqs is a handy utility, too.
 
 # Custom pyxform
--e git+https://github.com/kobotoolbox/pyxform.git@2.017.36#egg=pyxform
+-e git+https://github.com/kobotoolbox/pyxform.git@2.018.06#egg=pyxform
 
 # Formpack
--e git+https://github.com/kobotoolbox/formpack.git@07d87f04f4f4bab0b7ed6794325933e98811286f#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@c4fc418f46913d5e326b7fe63fa9b720c290a0f1#egg=formpack
 
 # More up-to-date version of django-digest than PyPI seems to have.
 # Also, python-digest is an unlisted dependency thereof.

diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
@@ -5,8 +5,8 @@
 #    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@07d87f04f4f4bab0b7ed6794325933e98811286f#egg=formpack
--e git+https://github.com/kobotoolbox/pyxform.git@2.017.36#egg=pyxform
+-e git+https://github.com/kobotoolbox/formpack.git@c4fc418f46913d5e326b7fe63fa9b720c290a0f1#egg=formpack
+-e git+https://github.com/kobotoolbox/pyxform.git@2.018.06#egg=pyxform
 amqp==1.4.9
 anyjson==0.3.3
 begins==0.9
@@ -44,32 +44,32 @@ djangorestframework==3.3.3
 docutils==0.12            # via botocore, statistics
 drf-extensions==0.3.1
 enum34==1.1.6             # via cryptography
+et-xmlfile==1.0.1         # via openpyxl
 funcsigs==1.0.2           # via begins
 functools32==3.2.3.post2  # via jsonschema
 futures==3.1.1            # via s3transfer
 gunicorn==19.4.5
 idna==2.1                 # via cryptography
 ipaddress==1.0.17         # via cryptography
-jinja2==2.8               # via pyexcelerate
+jdcal==1.3                # via openpyxl
 jmespath==0.9.3           # via boto3, botocore
 jsonfield==1.0.3
-jsonschema==2.5.1
+jsonschema==2.6.0
 kombu==3.0.35
-lxml==2.3.4
+lxml==4.1.1
 markdown==2.6.6
-markupsafe==0.23          # via jinja2
 ndg-httpsclient==0.4.2
 oauthlib==1.0.3
-path.py==8.1.2
+openpyxl==2.5.0
+path.py==10.5
 psycopg2==2.7.3.2
 py==1.4.31                # via pytest
 pyasn1==0.1.9
 pycparser==2.14           # via cffi
-pyexcelerate==0.6.7
 pygments==2.1.3
 pymongo==3.3.0
 pyopenssl==16.1.0
-pyquery==1.2.11
+pyquery==1.4.0
 pytest-django==3.0.0
 pytest==3.0.3             # via pytest-django
 python-dateutil==2.6.0
@@ -87,5 +87,5 @@ unicodecsv==0.14.1
 uwsgi==2.0.13
 whitenoise==3.3.1
 whoosh==2.7.4
-xlrd==0.8.0
+xlrd==1.1.0
 xlwt==1.0.0