Skip to content

Upgrade formpack (which upgrades its dependencies) #2180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2019
Merged

Upgrade formpack (which upgrades its dependencies) #2180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ pip_compile: $(PIP_DEPENDENCY_TARGETS)

# All `pip` dependency files depend on their corresponding `.in` file and the base `requirements.in`.
$(PIP_DEPENDENCY_DIR)/%.txt: $(PIP_DEPENDENCY_DIR)/%.in $(PIP_DEPENDENCY_DIR)/requirements.in
pip-compile --output-file=$@ ${ARGS} $<
CUSTOM_COMPILE_COMMAND='make pip_compile' pip-compile --output-file=$@ ${ARGS} $<

19 changes: 13 additions & 6 deletions dependencies/pip/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file dev_requirements.txt dev_requirements.in
# make pip_compile
#
-e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
-e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
-e git+https://github.com/kobotoolbox/formpack.git@45a49bbcc794c6ac3756afe04a4f851c3da9219d#egg=formpack
amqp==2.4.0
anyjson==0.3.3
argparse==1.4.0 # via unittest2
asn1crypto==0.24.0 # via cryptography
backports.os==0.1.1 # via path.py
bcrypt==3.1.6 # via paramiko
begins==0.9
billiard==3.5.0.5
Expand All @@ -20,6 +21,8 @@ celery==4.2.1
certifi==2018.11.29 # via requests
cffi==1.8.3 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
configparser==3.7.1 # via importlib-metadata
contextlib2==0.5.5 # via importlib-metadata
cookies==2.2.1 # via responses
cryptography==2.2.2 # via fabric, paramiko, pyopenssl
cssselect==1.0.3 # via pyquery
Expand Down Expand Up @@ -57,26 +60,28 @@ fabric==2.4.0
formencode==1.3.1 # via pyxform
funcsigs==1.0.2 # via begins, mock
functools32==3.2.3.post2 # via jsonschema
future==0.17.1 # via django-ses
future==0.17.1 # via backports.os, django-ses
futures==3.2.0 # via s3transfer
gunicorn==19.4.5
idna==2.8 # via cryptography, requests
importlib-metadata==0.8 # via path.py
invoke==1.2.0 # via fabric
ipaddress==1.0.17 # via cryptography
jmespath==0.9.3 # via boto3, botocore
jsonfield==1.0.3
jsonschema==2.6.0
kombu==4.2.2.post1
linecache2==1.0.0 # via traceback2
lxml==4.2.1
lxml==4.3.0
markdown==3.0.1
mock==2.0.0
ndg-httpsclient==0.4.2
oauthlib==1.0.3
paramiko==2.4.2 # via fabric
path.py==11.0.1
path.py==11.5.0
pathlib2==2.3.3 # via importlib-metadata
pbr==4.0.2 # via mock
psycopg2-binary==2.7.6.1
psycopg2==2.7.7 # via django-jsonbfield, django-toolbelt
py==1.4.31 # via pytest
pyasn1==0.1.9
pycparser==2.14 # via cffi
Expand All @@ -94,6 +99,7 @@ pyxform==0.12.0
requests==2.21.0
responses==0.9.0
s3transfer==0.1.13 # via boto3
scandir==1.9.0 # via pathlib2
shortuuid==0.4.3
six==1.12.0
sqlparse==0.1.19
Expand All @@ -112,3 +118,4 @@ whoosh==2.7.4
xlrd==1.1.0
xlsxwriter==1.1.2
xlwt==1.3.0
zipp==0.3.3 # via importlib-metadata
20 changes: 13 additions & 7 deletions dependencies/pip/external_services.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file external_services.txt external_services.in
# make pip_compile
#
-e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
-e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
-e git+https://github.com/kobotoolbox/formpack.git@45a49bbcc794c6ac3756afe04a4f851c3da9219d#egg=formpack
amqp==2.4.0
anyjson==0.3.3
argparse==1.4.0 # via unittest2
asn1crypto==0.24.0 # via cryptography
backports.os==0.1.1 # via path.py
begins==0.9
billiard==3.5.0.5
boto3==1.9.80
Expand All @@ -19,7 +20,8 @@ celery==4.2.1
certifi==2018.11.29 # via requests
cffi==1.8.3 # via cryptography
chardet==3.0.4 # via requests
contextlib2==0.5.5 # via raven
configparser==3.7.1 # via importlib-metadata
contextlib2==0.5.5 # via importlib-metadata, raven
cookies==2.2.1 # via responses
cryptography==2.2.2 # via pyopenssl
cssselect==1.0.3 # via pyquery
Expand Down Expand Up @@ -56,25 +58,27 @@ 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
future==0.17.1 # via django-ses
future==0.17.1 # via backports.os, django-ses
futures==3.2.0 # via s3transfer
gunicorn==19.4.5
idna==2.8 # via cryptography, requests
importlib-metadata==0.8 # via path.py
ipaddress==1.0.17 # via cryptography
jmespath==0.9.3 # via boto3, botocore
jsonfield==1.0.3
jsonschema==2.6.0
kombu==4.2.2.post1
linecache2==1.0.0 # via traceback2
lxml==4.2.1
lxml==4.3.0
markdown==3.0.1
mock==2.0.0
ndg-httpsclient==0.4.2
newrelic==2.84.0.64
oauthlib==1.0.3
path.py==11.0.1
path.py==11.5.0
pathlib2==2.3.3 # via importlib-metadata
pbr==4.0.2 # via mock
psycopg2-binary==2.7.6.1
psycopg2==2.7.7 # via django-jsonbfield, django-toolbelt
py==1.4.31 # via pytest
pyasn1==0.1.9
pycparser==2.14 # via cffi
Expand All @@ -92,6 +96,7 @@ raven==5.32.0
requests==2.21.0
responses==0.9.0
s3transfer==0.1.13 # via boto3
scandir==1.9.0 # via pathlib2
shortuuid==0.4.3
six==1.12.0
sqlparse==0.1.19
Expand All @@ -110,3 +115,4 @@ whoosh==2.7.4
xlrd==1.1.0
xlsxwriter==1.1.2
xlwt==1.3.0
zipp==0.3.3 # via importlib-metadata
3 changes: 1 addition & 2 deletions dependencies/pip/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/bndr/pipreqs is a handy utility, too.

# Formpack
-e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
-e git+https://github.com/kobotoolbox/formpack.git@45a49bbcc794c6ac3756afe04a4f851c3da9219d#egg=formpack

# More up-to-date version of django-digest than PyPI seems to have.
# Also, python-digest is an unlisted dependency thereof.
Expand Down Expand Up @@ -49,7 +49,6 @@ kombu
lxml
mock
oauthlib
psycopg2-binary
pymongo
pytest-django
python-dateutil
Expand Down
19 changes: 13 additions & 6 deletions dependencies/pip/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file requirements.txt requirements.in
# make pip_compile
#
-e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
-e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
-e git+https://github.com/kobotoolbox/formpack.git@45a49bbcc794c6ac3756afe04a4f851c3da9219d#egg=formpack
amqp==2.4.0
anyjson==0.3.3
argparse==1.4.0 # via unittest2
asn1crypto==0.24.0 # via cryptography
backports.os==0.1.1 # via path.py
begins==0.9
billiard==3.5.0.5
boto3==1.9.80
Expand All @@ -19,6 +20,8 @@ celery==4.2.1
certifi==2018.11.29 # via requests
cffi==1.8.3 # via cryptography
chardet==3.0.4 # via requests
configparser==3.7.1 # via importlib-metadata
contextlib2==0.5.5 # via importlib-metadata
cookies==2.2.1 # via responses
cryptography==2.2.2 # via pyopenssl
cssselect==1.0.3 # via pyquery
Expand Down Expand Up @@ -55,24 +58,26 @@ 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
future==0.17.1 # via django-ses
future==0.17.1 # via backports.os, django-ses
futures==3.2.0 # via s3transfer
gunicorn==19.4.5
idna==2.8 # via cryptography, requests
importlib-metadata==0.8 # via path.py
ipaddress==1.0.17 # via cryptography
jmespath==0.9.3 # via boto3, botocore
jsonfield==1.0.3
jsonschema==2.6.0
kombu==4.2.2.post1
linecache2==1.0.0 # via traceback2
lxml==4.2.1
lxml==4.3.0
markdown==3.0.1
mock==2.0.0
ndg-httpsclient==0.4.2
oauthlib==1.0.3
path.py==11.0.1
path.py==11.5.0
pathlib2==2.3.3 # via importlib-metadata
pbr==4.0.2 # via mock
psycopg2-binary==2.7.6.1
psycopg2==2.7.7 # via django-jsonbfield, django-toolbelt
py==1.4.31 # via pytest
pyasn1==0.1.9
pycparser==2.14 # via cffi
Expand All @@ -89,6 +94,7 @@ pyxform==0.12.0
requests==2.21.0
responses==0.9.0
s3transfer==0.1.13 # via boto3
scandir==1.9.0 # via pathlib2
shortuuid==0.4.3
six==1.12.0
sqlparse==0.1.19
Expand All @@ -106,3 +112,4 @@ whoosh==2.7.4
xlrd==1.1.0
xlsxwriter==1.1.2
xlwt==1.3.0
zipp==0.3.3 # via importlib-metadata