FIX appveyor doesn't need option USE_PYTEST anymore

NelleV · NelleV · commit 227d9513ee40 · 2017-03-11T12:08:12.000-08:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -15,7 +15,6 @@ environment:
     # Workaround for https://github.com/conda/conda-build/issues/636
     PYTHONIOENCODING: "UTF-8"
     PYTEST_ARGS: -ra --timeout=300 --durations=25 -n %NUMBER_OF_PROCESSORS% --cov-report= --cov=lib -m "not network"
-    USE_PYTEST: no
     PYTHONHASHSEED: 0  # Workaround for pytest-xdist flaky collection order
                        # https://github.com/pytest-dev/pytest/issues/920
                        # https://github.com/pytest-dev/pytest/issues/1075
@@ -31,7 +30,6 @@ environment:
       PYTHON_VERSION: "2.7"
       TEST_ALL: "no"
       CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
-      USE_PYTEST: "yes"
     - TARGET_ARCH: "x64"
       CONDA_PY: "35"
       CONDA_NPY: "110"
@@ -62,7 +60,7 @@ cache:
   - '%USERPROFILE%\.cache\matplotlib'
 
 init:
-  - cmd: "ECHO %PYTHON_VERSION% PYTEST=%USE_PYTEST% %CONDA_INSTALL_LOCN%"
+  - cmd: "ECHO %PYTHON_VERSION% %CONDA_INSTALL_LOCN%"
 
 install:
   - cmd: set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
@@ -134,8 +132,7 @@ test_script:
   - python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
   # tests
   - echo The following args are passed to pytest %PYTEST_ARGS%
-  - if x%USE_PYTEST% == xyes py.test %PYTEST_ARGS%
-  - if x%USE_PYTEST% == xno python tests.py %PYTEST_ARGS%
+  - python tests.py %PYTEST_ARGS%
   # Generate a html for visual tests
   - python visual_tests.py
   - pip install codecov
