Merge pull request googleapis#2474 from dhermes/move-pandas-test

dhermes · web-flow · commit fbc80a481562 · 2016-10-03T12:53:06.000-07:00
Moving pandas tox env. into monitoring config.
diff --git a/monitoring/tox.ini b/monitoring/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,cover,{py27,py34,py35}-{pandas}
 
 [testing]
 deps =
@@ -18,13 +18,14 @@ commands =
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
+    pandas: pandas
 
 [testenv:cover]
 basepython =
     python2.7
 commands =
     {[testing]covercmd}
 deps =
-    {[testenv]deps}
+    {[testing]deps}
     coverage
     pytest-cov
diff --git a/tox.ini b/tox.ini
@@ -125,13 +125,6 @@ skip_install =
 [testenv:isolated-cover]
 commands = {[testenv]commands}
 
-[testenv:py27-pandas]
-basepython =
-    python2.7
-deps =
-    {[testing]deps}
-    pandas
-
 [testenv:cover]
 basepython =
     python2.7
