Skip to content
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

Make requirements with pip-tools 3.8.0 #24514

Merged
merged 5 commits into from
Jun 7, 2019
Merged

Make requirements with pip-tools 3.8.0 #24514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00f094e
Make requirements with pip-tools 3.8.0
millerdev Jun 7, 2019
afbf30d
Fail fast on `make requirements` failure
millerdev Jun 7, 2019
e269e9d
Pin pip-tools version
millerdev Jun 7, 2019
19193a5
Undo erroneous cryptography upgrade
millerdev Jun 7, 2019
24019ad
Merge remote-tracking branch 'origin/master' into dm/make-reqs
millerdev Jun 7, 2019
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
7 changes: 1 addition & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion requirements-python3/dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
3 changes: 3 additions & 0 deletions requirements-python3/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions requirements-python3/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion requirements/dev-requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion requirements/dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
3 changes: 3 additions & 0 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions requirements/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions scripts/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/test-make-requirements.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e

pip install pip-tools==3.6.1
pip install pip-tools>=3.8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this is still fragile to this kind of change. Long term, maybe we should run the requirements test after the other tests? that way this comparison could run in the same virtualenv where we have pinned pip-tools.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Long term, maybe we should run the requirements test after the other tests?

Sure, I'll do that in a separate PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#24522

make requirements
git diff
git update-index -q --refresh
Expand Down