From b178cf571b5e706bc2fc2e107b2139fb41ee978b Mon Sep 17 00:00:00 2001
From: Sun Austin <austin.sun@intel.com>
Date: Mon, 20 Aug 2018 16:47:56 +0800
Subject: [PATCH] Fix dependency path in cgts-client tox.ini

Change the deps path in tox.ini from previous cgcs dir to stx dir
and remove unnecessary dirs

Story: 2003375
Task: 24765

Change-Id: I2d798d4a0ec3858ac6abbdec1de533ccd18b610a
Signed-off-by: Sun Austin <austin.sun@intel.com>
---
 sysinv/cgts-client/cgts-client/setup.cfg | 1 -
 sysinv/cgts-client/cgts-client/setup.py  | 1 -
 sysinv/cgts-client/cgts-client/tox.ini   | 6 ++----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sysinv/cgts-client/cgts-client/setup.cfg b/sysinv/cgts-client/cgts-client/setup.cfg
index c1c7d7f150..e1ee3e7b2c 100644
--- a/sysinv/cgts-client/cgts-client/setup.cfg
+++ b/sysinv/cgts-client/cgts-client/setup.cfg
@@ -1,6 +1,5 @@
 [metadata]
 name = cgtsclient
-version = 1.0.0
 summary = Titanium Cloud System Client and CLI
 description-file =
     README.rst
diff --git a/sysinv/cgts-client/cgts-client/setup.py b/sysinv/cgts-client/cgts-client/setup.py
index 5ca496919e..aac9a2c297 100644
--- a/sysinv/cgts-client/cgts-client/setup.py
+++ b/sysinv/cgts-client/cgts-client/setup.py
@@ -10,7 +10,6 @@ import setuptools
 
 setuptools.setup(
     name='cgtsclient',
-    version='1.0.0',
     description='Titanium Cloud System Client and CLI',
     classifiers=[
         'Environment :: OpenStack',
diff --git a/sysinv/cgts-client/cgts-client/tox.ini b/sysinv/cgts-client/cgts-client/tox.ini
index 0da7068993..58772d9c9d 100644
--- a/sysinv/cgts-client/cgts-client/tox.ini
+++ b/sysinv/cgts-client/cgts-client/tox.ini
@@ -5,12 +5,10 @@ minversion = 1.6
 
 # tox does not work if the path to the workdir is too long, so move it to /tmp
 toxworkdir = /tmp/{env:USER}_cgtsclienttox
-wrsdir = {toxinidir}/../../../../../../../../..
-cgcsdir = {toxinidir}/../../../../..
-avsdir = {toxinidir}/../../../../../../../../wr-avs/layers/avs
+cgcsdir = {toxinidir}/../../../..
 distshare={toxworkdir}/.tox/distshare
 
-wrdeps = -e{[tox]cgcsdir}/tsconfig/tsconfig
+wrdeps = -e{[tox]cgcsdir}/stx-update/tsconfig/tsconfig
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}