Merge pull request #100 from ccordoba12/use-defaults

PR: Use conda defaults channel for testing
andfoy · May 23, 2018 · 6b55978 · 6b55978
2 parents 2145471 + 93ffe7e
commit 6b55978
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -51,16 +51,16 @@ install:
   # Use test conda environment
   - "activate test"
   # - CALL "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" %ARCH%
-  - "conda install --file requirements.txt -c conda-forge"
+  - "conda install --file requirements.txt"
   - "pip install twine"
   - "%CMD_IN_ENV% python setup.py build_ext -i --compiler=mingw32"
 
 # Not a .NET project, we build in the install step instead
 build: false
 
 test_script:
-  - "%CMD_IN_ENV% ciocheck winpty --disable-tests"
-  - "conda remove pytest-xdist"
+  #- "%CMD_IN_ENV% ciocheck winpty --disable-tests"
+  #- "conda remove pytest-xdist"
   - "%CMD_IN_ENV% pytest winpty --cov=winpty --cov-report term-missing -v"
   - "%CMD_IN_ENV% coveralls"
 

diff --git a/requirements.txt b/requirements.txt
@@ -8,6 +8,6 @@ m2w64-toolchain
 libpython
 
 # Test requirements
-ciocheck
 coveralls
 flaky
+pytest-cov