Make sure conda doesn't include pytest-arraydiff

Author: astrofrog

.travis.yml

@@ -13,10 +13,13 @@ env:
 
 install:
     - git clone git://github.com/astropy/ci-helpers.git
-    - source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
+    - source ci-helpers/travis/setup_conda.sh
+
+    # Make sure pytest-arraydiff wasn't installed by conda
+    - conda remove pytest-arraydiff --force || true
 
     # Need to use develop instead of install to make sure coverage works
-    - python setup.py develop
+    - pip install -e .
 
 script:
    - python -c 'import pytest_arraydiff.plugin'

pytest_arraydiff/plugin.py

@@ -217,7 +217,6 @@ def pytest_runtest_setup(self, item):
             compare = item.get_marker('array_compare')
         else:
             compare = item.get_closest_marker('array_compare')
-        
 
         if compare is None:
             return