From d54e96f347d59b41857961527c6fc73ed6eee098 Mon Sep 17 00:00:00 2001 From: Yuta Namiki Date: Thu, 20 Jul 2017 22:33:32 +0900 Subject: [PATCH] [FAB-5289] requirements.txt for BDD tests The document, the README, and the script have differenct descriptions of dependencies of the BDD tests. This commit installs requirement.txt for pip and updates the document and the script to use this. A user can get a same environment now. Signed-off-by: Yuta Namiki Change-Id: I4bd9210ef312f170104846226642289394193aeb --- bddtests/README.md | 11 +--------- devenv/bddtests-requirements.txt | 37 ++++++++++++++++++++++++++++++++ docs/source/dev-setup/devenv.rst | 5 ++--- scripts/install_behave.sh | 22 ++++--------------- 4 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 devenv/bddtests-requirements.txt diff --git a/bddtests/README.md b/bddtests/README.md index 44cfd2c28b4..d243363fb27 100644 --- a/bddtests/README.md +++ b/bddtests/README.md @@ -34,16 +34,7 @@ This will automaticall switch you to the new environment if successful. In the **NOTE**: If you have issues installing the modules below, and you are running the vagrant environment, consider performing a **vagrant destroy** followed by a **vagrant up**. ``` - pip install behave - pip install grpcio-tools - pip install "pysha3==1.0b1" - pip install b3j0f.aop - pip install jinja2 - # The pyopenssl install gives errors, but installs succeeds - pip install pyopenssl - pip install ecdsa - pip install python-slugify - pip install pyyaml + pip install -r ../devenv/bddtests-requirements.txt ``` ### Running behave diff --git a/devenv/bddtests-requirements.txt b/devenv/bddtests-requirements.txt new file mode 100644 index 00000000000..364268bac54 --- /dev/null +++ b/devenv/bddtests-requirements.txt @@ -0,0 +1,37 @@ +# pip install behave +# pip install \ +# b3j0f.aop \ +# ecdsa \ +# enum34 \ +# grpcio \ +# Jinja2 \ +# protobuf \ +# pyOpenSSL \ +# pysha3 \ +# python-slugify \ +# PyYAML +asn1crypto==0.22.0 +b3j0f.aop==0.8.4 +b3j0f.utils==1.4.4 +behave==1.2.5 +cffi==1.10.0 +cryptography==2.0 +ecdsa==0.13 +enum34==1.1.6 +futures==3.1.1 +grpcio==1.4.0 +idna==2.5 +ipaddress==1.0.18 +Jinja2==2.9.6 +MarkupSafe==1.0 +ordereddict==1.1 +parse==1.8.2 +parse-type==0.3.4 +protobuf==3.3.0 +pycparser==2.18 +pyOpenSSL==17.1.0 +pysha3==1.0.2 +python-slugify==1.2.4 +PyYAML==3.12 +six==1.10.0 +Unidecode==0.4.21 diff --git a/docs/source/dev-setup/devenv.rst b/docs/source/dev-setup/devenv.rst index fc50d01080d..2dfb30a24b5 100644 --- a/docs/source/dev-setup/devenv.rst +++ b/docs/source/dev-setup/devenv.rst @@ -55,11 +55,10 @@ Prerequisites :: pip install --upgrade pip - pip install behave nose - pip install -I flask==0.10.1 python-dateutil==2.2 pytz==2014.3 pyyaml==3.10 couchdb==1.0 flask-cors==2.0.1 requests==2.4.3 pyOpenSSL==16.2.0 pysha3==1.0b1 grpcio==1.0.4 #PIP packages required for some behave tests - pip install urllib3 ndg-httpsclient pyasn1 ecdsa python-slugify grpcio-tools jinja2 b3j0f.aop six + pip install -r devenv/bddtests-requirements.txt + Steps ~~~~~ diff --git a/scripts/install_behave.sh b/scripts/install_behave.sh index 8e4bfeb58f3..049ea7f1b15 100755 --- a/scripts/install_behave.sh +++ b/scripts/install_behave.sh @@ -14,7 +14,7 @@ # Update system apt-get update -qq -# Install Python, pip, behave, nose +# Install Python, pip, behave # # install python-dev and libyaml-dev to get compiled speedups apt-get install --yes python-dev @@ -27,23 +27,9 @@ apt-get install --yes build-essential # https://cryptography.io/en/stable/installation/#building-cryptography-on-linux apt-get install --yes libssl-dev libffi-dev pip install --upgrade pip -pip install behave -pip install nose - -# updater-server, update-engine, and update-service-common dependencies (for running locally) -pip install -I flask==0.10.1 python-dateutil==2.2 pytz==2014.3 pyyaml==3.10 couchdb==1.0 flask-cors==2.0.1 requests==2.4.3 pyOpenSSL==16.2.0 pysha3==1.0b1 - -# Python grpc package for behave tests -# Required to update six for grpcio -pip install --ignore-installed six -pip install --upgrade 'grpcio==0.13.1' - -# Pip packages required for some behave tests -pip install ecdsa python-slugify b3j0f.aop -pip install google -pip install protobuf -pip install pyyaml -pip install pykafka + +# Pip packages required for behave tests +pip install -r ../devenv/bddtests-requirements.txt # install ruby and apiaryio #apt-get install --yes ruby ruby-dev gcc