Use tox to build wheels

Author: whtsky

.travis.yml

@@ -1,6 +1,5 @@
 os: osx
 language: generic
-osx_image: beta-xcode6.2  # OS X 10.9
 env:
   - VERSION=2.7
   - VERSION=3.3

appveyor.yml

@@ -2,57 +2,28 @@ version: '{branch}-{build}'
 cache:
   - '%LOCALAPPDATA%\pip\Cache'
 environment:
+  PYTHON: C:\Python35
   password:
     secure: pp1j5lAB9NN8ZDasgY+oxoGrNw0+4gGzbNZmHVwJkCzUyrNBP5ZIuCrwjmx4q6ifg7RMiE3bVt9MljFCJh3XpsvVOAcx+AGKsHSjtXd40HM=
-
-  matrix:
-    - PYTHON: "C:\\Python26"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python26-x64"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python27"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python33"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python33-x64"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python34"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python35"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_ARCH: "64"
-
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
 init:
-  - "ECHO Python %PYTHON%"
+  - ps: "ls C:/Python*"
 
 install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\scripts;%PATH%"
+  - 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%"
+  - 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"
 
-build_script:
-  - "cython bencoder.pyx"
-  - "python setup.py install"
+build: off
 
 test_script:
-  - "del bencoder.c"
-  - "python setup.py test"
+  - tox
 
 on_success:
+  - tox -c tox-wheels.ini
   - pip install codecov
   - codecov
 
@@ -64,6 +35,7 @@ deploy_script:
   - echo username=whtsky                             >> %USERPROFILE%\\.pypirc
   - echo password=%password%                         >> %USERPROFILE%\\.pypirc
   - set HOME=%USERPROFILE%
-  - ps: if($env:APPVEYOR_REPO_TAG -eq $TRUE) { "python -W ignore setup.py bdist_wheel upload" }
+  - pip install twine
+  - ps: if($env:APPVEYOR_REPO_TAG -eq $TRUE) { "twine upload wheelhouse/bencoder*.whl" }
 
 deploy : on

ci/build-wheels.sh

@@ -7,6 +7,8 @@ cd /io
 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
 

pytest-nocov.ini

@@ -0,0 +1,3 @@
+[pytest]
+testpaths = tests
+addopts = -rw

release.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 cython bencoder.pyx
-python setup.py sdist --formats=zip,gztar bdist_wheel register
+python setup.py sdist --formats=zip,gztar register
+tox -c tox-wheels.ini
 twine upload dist/*

setup.py

@@ -11,8 +11,10 @@
     install_requires.append('ordereddict>=1.1')
 
 base_path = os.path.dirname(os.path.abspath(__file__))
+pyx_path = os.path.join(base_path, 'bencoder.pyx')
+c_path = os.path.join(base_path, 'bencoder.c')
 
-if sys.argv[-1] == 'test':
+if sys.argv[-1] == 'test' and platform.python_implementation() == 'CPython':
     from Cython.Compiler.Options import directive_defaults
 
     directive_defaults['linetrace'] = True
@@ -21,14 +23,45 @@
     from Cython.Build import cythonize
     ext_modules = cythonize(Extension(
         "bencoder",
-        ["bencoder.pyx"],
+        [pyx_path],
         define_macros=[('CYTHON_TRACE', '1')] 
     ))
-else:
+elif os.path.exists(c_path):
     ext_modules = [Extension(
         'bencoder',
-        [os.path.join(base_path, 'bencoder.c')]
+        [c_path]
     )]
+else:
+    from Cython.Build import cythonize
+    ext_modules = cythonize(Extension(
+        "bencoder",
+        [pyx_path]
+    ))
+
+
+# patch bdist_wheel
+cmdclass = {}
+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'
+    )
+
+    class _bdist_wheel(bdist_wheel):
+        def get_tag(self):
+            tag = bdist_wheel.get_tag(self)
+            if tag[2] == 'macosx_10_6_intel':
+                tag = (tag[0], tag[1], REPLACE)
+            return tag
+
+    cmdclass['bdist_wheel'] = _bdist_wheel
+except ImportError:
+    pass
 
 
 setup(
@@ -44,6 +77,7 @@
     zip_safe=False,
     include_package_data=True,
     keywords=['bencoding', 'encode', 'decode', 'bittorrent', 'bencode', 'bencoder', 'cython'],
+    cmdclass=cmdclass,
     classifiers=[
         'Environment :: Other Environment',
         'Intended Audience :: Developers',

tox-wheels.ini

@@ -0,0 +1,8 @@
+[tox]
+envlist = py26, py27, py33, py34, py35, pypy
+
+[testenv]
+commands = pip wheel {toxinidir} -w {toxinidir}/wheelhouse/
+skip_install = True
+deps =
+  cython

tox.ini

@@ -5,4 +5,11 @@ envlist = py26, py27, py33, py34, py35, pypy
 commands = python setup.py test
 skip_install = True
 deps =
-  cython
+  cython
+
+[testenv:pypy]
+skip_install = False
+deps =
+  cython
+  pytest
+commands = py.test -c pytest-nocov.ini