From 4c88f0227f5b1f1ebc95cf080657b6a34672c8fa Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Tue, 4 Feb 2020 12:16:38 +0100 Subject: Define vcpe scripts dependencies via setuptools config Dependencies definition is moved to setuptools so that they can be consumed by both - vcpe automation scripts setup and by testing framwewok. Change-Id: Id9cfda52afc3527d2cd3be8cfcf3f82539468261 Signed-off-by: Bartek Grzybowski Issue-ID: INT-1427 --- test/vcpe/bin/setup.sh | 15 ++++----------- test/vcpe/setup.py | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 test/vcpe/setup.py diff --git a/test/vcpe/bin/setup.sh b/test/vcpe/bin/setup.sh index 5614f1a70..ad0e78c74 100755 --- a/test/vcpe/bin/setup.sh +++ b/test/vcpe/bin/setup.sh @@ -2,7 +2,7 @@ # COPYRIGHT NOTICE STARTS HERE # -# Copyright 2019 Samsung Electronics Co., Ltd. +# Copyright 2019-2020 Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,15 +32,8 @@ then yum -y install python-devel gcc; fi +pip_setup_path="$(dirname $0)/../" + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py python get-pip.py -pip install -I \ - ipaddress \ - pyyaml \ - mysql-connector-python \ - progressbar2 \ - python-novaclient \ - python-openstackclient \ - python-heatclient \ - kubernetes \ - netaddr +pip install -I ${pip_setup_path} diff --git a/test/vcpe/setup.py b/test/vcpe/setup.py new file mode 100644 index 000000000..7f9bbd0d6 --- /dev/null +++ b/test/vcpe/setup.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python + +# COPYRIGHT NOTICE STARTS HERE +# +# Copyright 2020 Samsung Electronics Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# COPYRIGHT NOTICE ENDS HERE + +# This file is only meant to be a single source of truth for package +# dependencies. It's consumed by bin/setup.sh and tox hence shouldn't +# be run directly for package builds as currently vcpe scripts are not +# provided as a python package. + +import setuptools + +# Define vCPE scripts dependencies below +setuptools.setup( + install_requires=[ + 'ipaddress', + 'pyyaml', + 'mysql-connector-python', + 'progressbar2', + 'python-novaclient', + 'python-openstackclient', + 'python-heatclient', + 'kubernetes', + 'netaddr' + ] +) -- cgit 1.2.3-korg