From 00f094efc048fa1ece61ec5425d33a71c9871726 Mon Sep 17 00:00:00 2001 From: Daniel Miller Date: Fri, 7 Jun 2019 08:56:44 -0400 Subject: [PATCH 1/4] Make requirements with pip-tools 3.8.0 --- requirements-python3/dev-requirements.txt | 5 ++++- requirements-python3/prod-requirements.txt | 2 +- requirements-python3/requirements.txt | 5 ++++- requirements-python3/test-requirements.txt | 5 ++++- requirements/dev-requirements.txt | 5 ++++- requirements/prod-requirements.txt | 2 +- requirements/requirements.txt | 5 ++++- requirements/test-requirements.txt | 5 ++++- 8 files changed, 26 insertions(+), 8 deletions(-) diff --git a/requirements-python3/dev-requirements.txt b/requirements-python3/dev-requirements.txt index 83ce7e11c0eb..6b3b1511e802 100644 --- a/requirements-python3/dev-requirements.txt +++ b/requirements-python3/dev-requirements.txt @@ -33,7 +33,7 @@ commonmark==0.9.0 # via recommonmark concurrent-log-handler==0.9.12 contextlib2==0.5.5 coverage==4.5.1 -cryptography==2.6.1 +cryptography==2.7 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 @@ -220,3 +220,6 @@ wheel==0.29.0 wrapt==1.11.1 xlrd==1.0.0 xlwt==1.3.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via django-websocket-redis, ipdb, ipython, python-levenshtein, python-termstyle, sphinx diff --git a/requirements-python3/prod-requirements.txt b/requirements-python3/prod-requirements.txt index 135d9a47bd67..9e9b197e28a5 100644 --- a/requirements-python3/prod-requirements.txt +++ b/requirements-python3/prod-requirements.txt @@ -25,7 +25,7 @@ cloudant==2.12.0 commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 -cryptography==2.6.1 +cryptography==2.7 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 diff --git a/requirements-python3/requirements.txt b/requirements-python3/requirements.txt index 3f59db97079c..37708b245246 100644 --- a/requirements-python3/requirements.txt +++ b/requirements-python3/requirements.txt @@ -23,7 +23,7 @@ cloudant==2.12.0 # via jsonobject-couchdbkit commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 -cryptography==2.6.1 # via pyopenssl, requests +cryptography==2.7 # via pyopenssl, requests csiphash==0.0.5 cssselect2==0.2.1 # via weasyprint csv342==1.0.0 @@ -161,3 +161,6 @@ werkzeug==0.11.15 wrapt==1.11.1 # via ddtrace xlrd==1.0.0 xlwt==1.3.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via django-websocket-redis, python-levenshtein diff --git a/requirements-python3/test-requirements.txt b/requirements-python3/test-requirements.txt index 321f7e33d35b..b994d05c0f67 100644 --- a/requirements-python3/test-requirements.txt +++ b/requirements-python3/test-requirements.txt @@ -28,7 +28,7 @@ commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 coverage==4.5.1 -cryptography==2.6.1 +cryptography==2.7 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 @@ -177,3 +177,6 @@ werkzeug==0.11.15 wrapt==1.11.1 xlrd==1.0.0 xlwt==1.3.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via django-websocket-redis, python-levenshtein diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 60b0d9ba25f5..bd0eafb6a272 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -33,7 +33,7 @@ commonmark==0.9.0 # via recommonmark concurrent-log-handler==0.9.12 contextlib2==0.5.5 coverage==4.5.1 -cryptography==2.6.1 +cryptography==2.7 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 @@ -221,3 +221,6 @@ wheel==0.29.0 wrapt==1.11.1 xlrd==1.0.0 xlwt==1.3.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via django-websocket-redis, ipdb, ipython, python-levenshtein, python-termstyle, sphinx diff --git a/requirements/prod-requirements.txt b/requirements/prod-requirements.txt index a8aa636c6df7..15434bcc70c8 100644 --- a/requirements/prod-requirements.txt +++ b/requirements/prod-requirements.txt @@ -25,7 +25,7 @@ cloudant==2.12.0 commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 -cryptography==2.6.1 +cryptography==2.7 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c2c786dfd4c2..e7bc02791448 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -23,7 +23,7 @@ cloudant==2.12.0 # via jsonobject-couchdbkit commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 -cryptography==2.6.1 # via pyopenssl, requests +cryptography==2.7 # via pyopenssl, requests csiphash==0.0.5 cssselect2==0.2.1 # via weasyprint csv342==1.0.0 @@ -162,3 +162,6 @@ werkzeug==0.11.15 wrapt==1.11.1 # via ddtrace xlrd==1.0.0 xlwt==1.3.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via django-websocket-redis, python-levenshtein diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index ba300dc19f96..0c2dfa2966bb 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -28,7 +28,7 @@ commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 coverage==4.5.1 -cryptography==2.6.1 +cryptography==2.7 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 @@ -178,3 +178,6 @@ werkzeug==0.11.15 wrapt==1.11.1 xlrd==1.0.0 xlwt==1.3.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via django-websocket-redis, python-levenshtein From afbf30d09854302d4ab15ad6d116990f602f74f5 Mon Sep 17 00:00:00 2001 From: Daniel Miller Date: Fri, 7 Jun 2019 10:07:02 -0400 Subject: [PATCH 2/4] Fail fast on `make requirements` failure --- .travis.yml | 7 +------ scripts/run-tests.sh | 7 +++++++ scripts/test-make-requirements.sh | 0 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100755 scripts/run-tests.sh mode change 100644 => 100755 scripts/test-make-requirements.sh diff --git a/.travis.yml b/.travis.yml index 77666eace5d2..af5193f373c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,12 +35,7 @@ script: - export TRAVIS_HQ_USERNAME=$TRAVIS_HQ_USERNAME - export TRAVIS_HQ_PASSWORD=$TRAVIS_HQ_PASSWORD - export DATADOG_API_KEY=$DATADOG_API_KEY - - | - if [[ "$TEST_MAKE_REQUIREMENTS" == "yes" ]] - then - bash scripts/test-make-requirements.sh - fi - - "scripts/docker test --noinput --stop --verbosity=2 --divide-depth=1 --with-timing --threshold=10" + - scripts/run-tests.sh after_success: # create symlink so artifacts are available - sudo ln -s $(pwd) /mnt/commcare-hq-ro diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh new file mode 100755 index 000000000000..efa6310d8cc1 --- /dev/null +++ b/scripts/run-tests.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env bash + +set -ex # fail fast, print commands as they are executed + +[[ "$TEST_MAKE_REQUIREMENTS" == "yes" ]] && scripts/test-make-requirements.sh + +scripts/docker test --noinput --stop --verbosity=2 --divide-depth=1 --with-timing --threshold=10 diff --git a/scripts/test-make-requirements.sh b/scripts/test-make-requirements.sh old mode 100644 new mode 100755 From e269e9d40822628789f6135224d842839dfbfc87 Mon Sep 17 00:00:00 2001 From: Daniel Miller Date: Fri, 7 Jun 2019 10:47:32 -0400 Subject: [PATCH 3/4] Pin pip-tools version --- requirements-python3/dev-requirements.txt | 2 +- requirements/dev-requirements.in | 2 +- requirements/dev-requirements.txt | 2 +- scripts/test-make-requirements.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-python3/dev-requirements.txt b/requirements-python3/dev-requirements.txt index 6b3b1511e802..5c38eeb89a18 100644 --- a/requirements-python3/dev-requirements.txt +++ b/requirements-python3/dev-requirements.txt @@ -134,7 +134,7 @@ pexpect==4.7.0 # via ipython phonenumberslite==8.10.10 pickleshare==0.7.5 # via ipython pillow==6.0.0 -pip-tools==3.6.1 +pip-tools==3.8.0 ply==3.11 polib==1.1.0 prompt-toolkit==1.0.16 # via ipython diff --git a/requirements/dev-requirements.in b/requirements/dev-requirements.in index acffbc2f4782..acd87d0bd26f 100644 --- a/requirements/dev-requirements.in +++ b/requirements/dev-requirements.in @@ -14,7 +14,7 @@ graphviz==0.7 transifex-client==0.12.4 modernize gnureadline==6.3.8 -pip-tools~=3.0 +pip-tools>=3.8 # documentation Sphinx~=1.8 diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index bd0eafb6a272..2d4594d515e1 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -135,7 +135,7 @@ pexpect==4.7.0 # via ipython phonenumberslite==8.10.10 pickleshare==0.7.5 # via ipython pillow==6.0.0 -pip-tools==3.6.1 +pip-tools==3.8.0 ply==3.11 polib==1.1.0 prompt-toolkit==1.0.16 # via ipython diff --git a/scripts/test-make-requirements.sh b/scripts/test-make-requirements.sh index 2ca9e081d3f0..1dac56ed482a 100755 --- a/scripts/test-make-requirements.sh +++ b/scripts/test-make-requirements.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -pip install pip-tools +pip install pip-tools>=3.8 make requirements git diff git update-index -q --refresh From 19193a53e345acafa08c364cda8eb95eee737228 Mon Sep 17 00:00:00 2001 From: Daniel Miller Date: Fri, 7 Jun 2019 11:00:24 -0400 Subject: [PATCH 4/4] Undo erroneous cryptography upgrade --- requirements-python3/dev-requirements.txt | 2 +- requirements-python3/prod-requirements.txt | 2 +- requirements-python3/requirements.txt | 2 +- requirements-python3/test-requirements.txt | 2 +- requirements/dev-requirements.txt | 2 +- requirements/prod-requirements.txt | 2 +- requirements/requirements.txt | 2 +- requirements/test-requirements.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements-python3/dev-requirements.txt b/requirements-python3/dev-requirements.txt index 5c38eeb89a18..6779791c8f7f 100644 --- a/requirements-python3/dev-requirements.txt +++ b/requirements-python3/dev-requirements.txt @@ -33,7 +33,7 @@ commonmark==0.9.0 # via recommonmark concurrent-log-handler==0.9.12 contextlib2==0.5.5 coverage==4.5.1 -cryptography==2.7 +cryptography==2.6.1 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 diff --git a/requirements-python3/prod-requirements.txt b/requirements-python3/prod-requirements.txt index 9e9b197e28a5..135d9a47bd67 100644 --- a/requirements-python3/prod-requirements.txt +++ b/requirements-python3/prod-requirements.txt @@ -25,7 +25,7 @@ cloudant==2.12.0 commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 -cryptography==2.7 +cryptography==2.6.1 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 diff --git a/requirements-python3/requirements.txt b/requirements-python3/requirements.txt index 37708b245246..1e58bb04b02a 100644 --- a/requirements-python3/requirements.txt +++ b/requirements-python3/requirements.txt @@ -23,7 +23,7 @@ cloudant==2.12.0 # via jsonobject-couchdbkit commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 -cryptography==2.7 # via pyopenssl, requests +cryptography==2.6.1 # via pyopenssl, requests csiphash==0.0.5 cssselect2==0.2.1 # via weasyprint csv342==1.0.0 diff --git a/requirements-python3/test-requirements.txt b/requirements-python3/test-requirements.txt index b994d05c0f67..80e9f777f362 100644 --- a/requirements-python3/test-requirements.txt +++ b/requirements-python3/test-requirements.txt @@ -28,7 +28,7 @@ commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 coverage==4.5.1 -cryptography==2.7 +cryptography==2.6.1 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 2d4594d515e1..97f1d7744249 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -33,7 +33,7 @@ commonmark==0.9.0 # via recommonmark concurrent-log-handler==0.9.12 contextlib2==0.5.5 coverage==4.5.1 -cryptography==2.7 +cryptography==2.6.1 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 diff --git a/requirements/prod-requirements.txt b/requirements/prod-requirements.txt index 15434bcc70c8..a8aa636c6df7 100644 --- a/requirements/prod-requirements.txt +++ b/requirements/prod-requirements.txt @@ -25,7 +25,7 @@ cloudant==2.12.0 commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 -cryptography==2.7 +cryptography==2.6.1 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e7bc02791448..cd83286b00b0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -23,7 +23,7 @@ cloudant==2.12.0 # via jsonobject-couchdbkit commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 -cryptography==2.7 # via pyopenssl, requests +cryptography==2.6.1 # via pyopenssl, requests csiphash==0.0.5 cssselect2==0.2.1 # via weasyprint csv342==1.0.0 diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 0c2dfa2966bb..3e0e37ea38ce 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -28,7 +28,7 @@ commcaretranslationchecker==0.9.3.5 concurrent-log-handler==0.9.12 contextlib2==0.5.5 coverage==4.5.1 -cryptography==2.7 +cryptography==2.6.1 csiphash==0.0.5 cssselect2==0.2.1 csv342==1.0.0