TST: Test with pandas installed on 2.7

jankatins · jankatins · commit 55ed86e10812 · 2015-08-31T15:53:38.000+02:00
Also make a unit test more specific, as it triggered a warning which
wasn't intended in that case. The warning is tested a few lines later...
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,7 @@ env:
     - secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
     - BUILD_DOCS=false
     - NUMPY=numpy
+    - PANDAS=
     - NPROC=2
     - TEST_ARGS=--no-pep8
 
@@ -36,7 +37,7 @@ matrix:
     - python: 2.6
       env: NUMPY=numpy==1.6 MOCK=mock==1.0.1
     - python: 2.7
-      env: MOCK=mock
+      env: MOCK=mock PANDAS=pandas
     - python: 3.3
     - python: 3.4
     - python: 2.7
@@ -62,7 +63,7 @@ install:
     pip install --upgrade setuptools
   # Install only from travis wheelhouse
   - if [ -z "$PRE" ]; then
-        wheelhouse_pip_install python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0;
+        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing pillow sphinx!=1.3.0;
     else
         pip install $PRE python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0;
     fi
diff --git a/lib/matplotlib/tests/test_labeled_data_unpacking.py b/lib/matplotlib/tests/test_labeled_data_unpacking.py
@@ -402,10 +402,10 @@ def funcy(ax, *args, **kwargs):
         return "{args} | {kwargs}".format(args=args, kwargs=kwargs)
 
     # the normal case...
-    data = {"x": "X", "y": "Y"}
-    assert_equal(funcy(None, "x", "y", data=data),
+    data = {"x": "X", "y1": "Y"}
+    assert_equal(funcy(None, "x", "y1", data=data),
                  "('X', 'Y') | {}")
-    assert_equal(funcy(None, "x", "y", "c", data=data),
+    assert_equal(funcy(None, "x", "y1", "c", data=data),
                  "('X', 'Y', 'c') | {}")
 
     # no arbitrary long args with data
