Merge pull request #19 from pytest-dev/universal-wheel

Universal wheel

.travis.yml

@@ -2,9 +2,8 @@ language: python
 python:
   - 2.6
   - 2.7
-  - 3.2
-  - 3.3
   - 3.4
+  - 3.5
   - pypy
 
 install:

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1

setup.py

@@ -1,12 +1,6 @@
-import sys
-
 from setuptools import setup
 
 
-dependencies = ['pytest>=2.4']
-if sys.version_info < (3, 3):
-    dependencies.append('mock')
-
 setup(
     name='pytest-mock',
     version='0.7.0',
@@ -15,7 +9,12 @@
     },
     py_modules=['pytest_mock'],
     platforms='any',
-    install_requires=dependencies,
+    install_requires=[
+        'pytest>=2.4',
+    ],
+    extras_require={
+        ':python_version=="2.6" or python_version=="2.7"': ['mock'],
+    },
     url='https://github.com/pytest-dev/pytest-mock/',
     license='LGPL',
     author='Bruno Oliveira',
@@ -31,9 +30,8 @@
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Testing',
     ]
 )

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 # note that tox expects interpreters to be found at C:\PythonXY,
 # with XY being python version ("27" or "34") for instance
-envlist = py26, py27, py32, py33, py34
+envlist = py26, py27, py34, py35
 
 [testenv]
 commands = py.test test_pytest_mock.py