Fix CI Scripts

Author: whtsky

appveyor.yml

@@ -2,20 +2,17 @@ version: '{branch}-{build}'
 cache:
   - '%LOCALAPPDATA%\pip\Cache'
 environment:
-  PYTHON: C:\Python35
   password:
     secure: pp1j5lAB9NN8ZDasgY+oxoGrNw0+4gGzbNZmHVwJkCzUyrNBP5ZIuCrwjmx4q6ifg7RMiE3bVt9MljFCJh3XpsvVOAcx+AGKsHSjtXd40HM=
-cache:
-  - '%LOCALAPPDATA%\pip\Cache'
 init:
   - ps: "ls C:/Python*"
 
 install:
   - choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
-  - "SET PATH=C:\tools\pypy\pypy;%PYTHON%;%PYTHON%\\scripts;%PATH%"
+  - SET PATH=C:\tools\pypy\pypy;C:\Python35;C:\Python35\scripts;%PATH%
   - pip install tox
   - echo "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 > "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\vcvars64.bat"
-  - "pip install -r dev-requirements.txt"
+  - pip install -r dev-requirements.txt
 
 build: off
 

ci/build-wheels.sh

@@ -3,21 +3,9 @@ set -e -x
 
 cd /io
 
-# tests
-for PYBIN in /opt/python/*/bin/; do
-    ${PYBIN}/pip install -r /io/dev-requirements.txt
-    ${PYBIN}/python setup.py test
-    pwd
-    ls
-    rm *.so
-done
-
-rm bencoder.c
-
 # compile wheels
 for PYBIN in /opt/python/*/bin/; do
-    ${PYBIN}/pip install -r /io/dev-requirements.txt
-    ${PYBIN}/cython bencoder.pyx
+    ${PYBIN}/pip install cython
     ${PYBIN}/pip wheel /io/ -w /tmp/wheelhouse/
 done
 
@@ -31,5 +19,6 @@ cp /tmp/wheelhouse/ordereddict* /io/wheelhouse
 # Install packages and test again
 for PYBIN in /opt/python/*/bin/; do
     ${PYBIN}/pip install bencoder.pyx --no-index -f /io/wheelhouse
-    (cd $/io; ${PYBIN}/py.test)
+    ${PYBIN}/pip install pytest
+    (cd /io; ${PYBIN}/py.test -c pytest-nocov.ini)
 done

setup.py

@@ -44,13 +44,13 @@
 try:
     from wheel.bdist_wheel import bdist_wheel
 
-    REPLACE = (
-        'macosx_10_6_intel.'
-        'macosx_10_9_intel.'
-        'macosx_10_9_x86_64.'
-        'macosx_10_10_intel.'
-        'macosx_10_10_x86_64'
-    )
+    REPLACE = '.'.join([
+        'macosx_10_6_intel',
+        'macosx_10_9_intel',
+        'macosx_10_9_x86_64',
+        'macosx_10_10_intel',
+        'macosx_10_10_x86_64',
+    ])
 
     class _bdist_wheel(bdist_wheel):
         def get_tag(self):

tox.ini

@@ -6,6 +6,8 @@ commands = python setup.py test
 skip_install = True
 deps =
   cython
+  pytest
+  pytest-cov
 
 [testenv:pypy]
 skip_install = False