Merge "Fix cherrypy dependency conflict"
This commit is contained in:
commit
d17b8e7f7f
|
@ -28,7 +28,7 @@ iso8601
|
|||
psutil
|
||||
fb-re2>=1.0.6
|
||||
paho-mqtt
|
||||
cherrypy
|
||||
cherrypy==18.3.0; # last version to support cheroot below
|
||||
ws4py
|
||||
routes
|
||||
pathspec
|
||||
|
|
|
@ -39,6 +39,9 @@ then
|
|||
fi
|
||||
pip install $*
|
||||
|
||||
# Fail-fast if pip detects conflicts
|
||||
pip check
|
||||
|
||||
# Check if we're installing zuul. If so install the managed ansible as well.
|
||||
if echo "$*" | grep -vq requirements.txt; then
|
||||
zuul-manage-ansible -v
|
||||
|
|
Loading…
Reference in New Issue