Skip to content

Commit

Permalink
[FAB-5289] requirements.txt for BDD tests
Browse files Browse the repository at this point in the history
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 <y-namiki@ak.jp.nec.com>
Change-Id: I4bd9210ef312f170104846226642289394193aeb
  • Loading branch information
Yuta Namiki committed Sep 12, 2017
1 parent c31b203 commit d54e96f
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 31 deletions.
11 changes: 1 addition & 10 deletions bddtests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 37 additions & 0 deletions devenv/bddtests-requirements.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions docs/source/dev-setup/devenv.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~
Expand Down
22 changes: 4 additions & 18 deletions scripts/install_behave.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit d54e96f

Please sign in to comment.