Skip to content

Commit d54e96f

Browse files
author
Yuta Namiki
committed
[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 <y-namiki@ak.jp.nec.com> Change-Id: I4bd9210ef312f170104846226642289394193aeb
1 parent c31b203 commit d54e96f

File tree

4 files changed

+44
-31
lines changed

4 files changed

+44
-31
lines changed

bddtests/README.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,7 @@ This will automaticall switch you to the new environment if successful. In the
3434
**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**.
3535

3636
```
37-
pip install behave
38-
pip install grpcio-tools
39-
pip install "pysha3==1.0b1"
40-
pip install b3j0f.aop
41-
pip install jinja2
42-
# The pyopenssl install gives errors, but installs succeeds
43-
pip install pyopenssl
44-
pip install ecdsa
45-
pip install python-slugify
46-
pip install pyyaml
37+
pip install -r ../devenv/bddtests-requirements.txt
4738
```
4839

4940
### Running behave

devenv/bddtests-requirements.txt

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# pip install behave
2+
# pip install \
3+
# b3j0f.aop \
4+
# ecdsa \
5+
# enum34 \
6+
# grpcio \
7+
# Jinja2 \
8+
# protobuf \
9+
# pyOpenSSL \
10+
# pysha3 \
11+
# python-slugify \
12+
# PyYAML
13+
asn1crypto==0.22.0
14+
b3j0f.aop==0.8.4
15+
b3j0f.utils==1.4.4
16+
behave==1.2.5
17+
cffi==1.10.0
18+
cryptography==2.0
19+
ecdsa==0.13
20+
enum34==1.1.6
21+
futures==3.1.1
22+
grpcio==1.4.0
23+
idna==2.5
24+
ipaddress==1.0.18
25+
Jinja2==2.9.6
26+
MarkupSafe==1.0
27+
ordereddict==1.1
28+
parse==1.8.2
29+
parse-type==0.3.4
30+
protobuf==3.3.0
31+
pycparser==2.18
32+
pyOpenSSL==17.1.0
33+
pysha3==1.0.2
34+
python-slugify==1.2.4
35+
PyYAML==3.12
36+
six==1.10.0
37+
Unidecode==0.4.21

docs/source/dev-setup/devenv.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ Prerequisites
5555
::
5656

5757
pip install --upgrade pip
58-
pip install behave nose
59-
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
6058

6159
#PIP packages required for some behave tests
62-
pip install urllib3 ndg-httpsclient pyasn1 ecdsa python-slugify grpcio-tools jinja2 b3j0f.aop six
60+
pip install -r devenv/bddtests-requirements.txt
61+
6362

6463
Steps
6564
~~~~~

scripts/install_behave.sh

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# Update system
1515
apt-get update -qq
1616

17-
# Install Python, pip, behave, nose
17+
# Install Python, pip, behave
1818
#
1919
# install python-dev and libyaml-dev to get compiled speedups
2020
apt-get install --yes python-dev
@@ -27,23 +27,9 @@ apt-get install --yes build-essential
2727
# https://cryptography.io/en/stable/installation/#building-cryptography-on-linux
2828
apt-get install --yes libssl-dev libffi-dev
2929
pip install --upgrade pip
30-
pip install behave
31-
pip install nose
32-
33-
# updater-server, update-engine, and update-service-common dependencies (for running locally)
34-
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
35-
36-
# Python grpc package for behave tests
37-
# Required to update six for grpcio
38-
pip install --ignore-installed six
39-
pip install --upgrade 'grpcio==0.13.1'
40-
41-
# Pip packages required for some behave tests
42-
pip install ecdsa python-slugify b3j0f.aop
43-
pip install google
44-
pip install protobuf
45-
pip install pyyaml
46-
pip install pykafka
30+
31+
# Pip packages required for behave tests
32+
pip install -r ../devenv/bddtests-requirements.txt
4733

4834
# install ruby and apiaryio
4935
#apt-get install --yes ruby ruby-dev gcc

0 commit comments

Comments
 (0)