From: alfonsomthd <almartin@redhat.com>
Date: Wed, 13 Feb 2019 16:17:30 +0000 (+0100)
Subject: mgr/dashboard: fix: tox not detecting deps changes
X-Git-Tag: v14.1.0~120^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58a61baa0ef6e3814d374cd5134cb290300e18f8;p=ceph.git

mgr/dashboard: fix: tox not detecting deps changes

* tox.ini: replaced 'deps' setting by appropriate commands
  due to this bug:
  https://github.com/tox-dev/tox/issues/149
  tox is not detecting changes in requirements.txt when using
  'deps' setting in 'tox.ini'.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/tox.ini b/src/pybind/mgr/dashboard/tox.ini
index e0876f4eb2f8..96ccc522f503 100644
--- a/src/pybind/mgr/dashboard/tox.ini
+++ b/src/pybind/mgr/dashboard/tox.ini
@@ -5,10 +5,6 @@ toxworkdir = {env:CEPH_BUILD_DIR}/dashboard
 minversion = 2.8.1
 
 [testenv]
-deps =
-    -r{toxinidir}/requirements.txt
-    py27: -r{toxinidir}/requirements-py27.txt
-    py3: -r{toxinidir}/requirements-py3.txt
 setenv=
     CFLAGS = -DXMLSEC_NO_SIZE_T
     UNITTEST = true
@@ -20,6 +16,9 @@ setenv=
     cov:  UNITTEST = true
     cov:  COVERAGE_FILE = .coverage.{envname}
 commands=
+    pip install -r {toxinidir}/requirements.txt
+    py27: pip install -r {toxinidir}/requirements-py27.txt
+    py3: pip install -r {toxinidir}/requirements-py3.txt
     cov: coverage erase
     cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --doctest-modules controllers/rbd.py services/ tests/ tools.py
     cov: coverage combine {toxinidir}/{env:COVERAGE_FILE}