[SEBA-496]
Update pip packages used in XOS containers, flatten containers
Fixed invalid YAML generated by xosgenx modeldefs.xtarget
Change-Id: Ic051170f3f9ef5a5d0dbba61aa6843458a435d49
diff --git a/scripts/setup_venv.sh b/scripts/setup_venv.sh
index 85955a1..dba8b15 100755
--- a/scripts/setup_venv.sh
+++ b/scripts/setup_venv.sh
@@ -21,7 +21,7 @@
WORKSPACE=${WORKSPACE:-.}
XOS_DIR=${XOS_DIR:-.}
-PIP_REQS=${PIP_REQS:-${XOS_DIR}/scripts/xos_dev_reqs.txt}
+PIP_REQS=${PIP_REQS:-${XOS_DIR}/containers/xos/requirements.txt}
VENVDIR="${WORKSPACE}/venv-xos"
# create venv if it's not yet there
@@ -34,7 +34,7 @@
echo "Installing python requirements in virtualenv with pip"
source "${VENVDIR}/bin/activate"
pip install --upgrade pip
-pip install -r "$PIP_REQS"
+pip install -r "$PIP_REQS" nose2 mock
pushd "$XOS_DIR/lib/xos-util"
python setup.py install
diff --git a/scripts/xos_dev_reqs.txt b/scripts/xos_dev_reqs.txt
deleted file mode 100644
index c881531..0000000
--- a/scripts/xos_dev_reqs.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Django==1.11.11
-Jinja2==2.10
-PyYAML==3.12
-Twisted==16.6.0
-astunparse==1.5.0
-colorama==0.3.9
-confluent-kafka==0.11.5
-django-extensions==2.1.5
-djangorestframework==3.9.1
-flake8==3.7.5
-grpcio-tools==1.12.0
-grpcio==1.12.0
-inflect==1.0.1
-ipaddress==1.0.19
-multistructlog==2.1.0
-netaddr==0.7.19
-networkx==1.11
-nose2==0.7.4
-ply==3.11
-plyxproto==4.0.0
-pykwalify==1.6.1
-python-consul~=1.1.0
-requests-mock==1.5.0
-tosca-parser==0.9.0