Fix wheel support. Refs omab#588

Author: omab

Makefile

@@ -4,8 +4,17 @@ docs:
 site: docs
 	rsync -avkz site/ tarf:sites/psa/
 
-publish:
-	python setup.py sdist bdist_wheel
-	twine upload dist/*
+build:
+	python setup.py sdist
+	python setup.py bdist_wheel --python-tag py2
+	BUILD_VERSION=3 python setup.py bdist_wheel --python-tag py3
+
+publish: build
+	python setup.py upload
+
+clean:
+	find . -name '*.py[co]' -delete
+	find . -name '__pycache__' -delete
+	rm -rf python_social_auth.egg-info dist build
 
 .PHONY: site docs publish

setup.cfg

@@ -9,6 +9,3 @@ with-coverage=1
 cover-erase=1
 cover-package=social
 rednose=1
-
-[wheel]
-universal = 1

setup.py

@@ -6,7 +6,7 @@
 from setuptools import setup
 
 
-PY3 = sys.version_info[0] == 3
+PY3 = os.environ.get('BUILD_VERSION') == '3' or sys.version_info[0] == 3
 
 version = __import__('social').__version__
 
@@ -46,34 +46,42 @@ def get_packages():
     return packages
 
 
-requires = ['requests>=1.1.0', 'oauthlib>=0.3.8', 'six>=1.2.0', 'PyJWT>=1.0.0']
-if PY3:
-    requires += ['python3-openid>=3.0.1', 'requests-oauthlib>0.3.2']
-else:
-    requires += ['python-openid>=2.2', 'requests-oauthlib>=0.3.1']
-
-
-setup(name='python-social-auth',
-      version=version,
-      author='Matias Aguirre',
-      author_email='[email protected]',
-      description='Python social authentication made simple.',
-      license='BSD',
-      keywords='django, flask, pyramid, webpy, openid, oauth, social auth',
-      url='https://github.com/omab/python-social-auth',
-      packages=get_packages(),
-      # package_data={'social': ['locale/*/LC_MESSAGES/*']},
-      long_description=long_description(),
-      install_requires=requires,
-      classifiers=['Development Status :: 4 - Beta',
-                   'Topic :: Internet',
-                   'License :: OSI Approved :: BSD License',
-                   'Intended Audience :: Developers',
-                   'Environment :: Web Environment',
-                   'Programming Language :: Python',
-                   'Programming Language :: Python :: 2.6',
-                   'Programming Language :: Python :: 2.7',
-                   'Programming Language :: Python :: 3'],
-      tests_require=['sure>=1.2.5', 'httpretty>=0.8.0', 'mock>=1.0.1'],
-      test_suite='social.tests',
-      zip_safe=False)
+requirements_file, tests_requirements_file = {
+    False: ('requirements.txt', 'social/tests/requirements.txt'),
+    True: ('requirements-python3.txt', 'social/tests/requirements-python3.txt')
+}[PY3]
+
+with open(requirements_file, 'r') as f:
+    requirements = f.readlines()
+
+with open(tests_requirements_file, 'r') as f:
+    tests_requirements = f.readlines()
+
+setup(
+    name='python-social-auth',
+    version=version,
+    author='Matias Aguirre',
+    author_email='[email protected]',
+    description='Python social authentication made simple.',
+    license='BSD',
+    keywords='django, flask, pyramid, webpy, openid, oauth, social auth',
+    url='https://github.com/omab/python-social-auth',
+    packages=get_packages(),
+    # package_data={'social': ['locale/*/LC_MESSAGES/*']},
+    long_description=long_description(),
+    install_requires=requirements,
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Topic :: Internet',
+        'License :: OSI Approved :: BSD License',
+        'Intended Audience :: Developers',
+        'Environment :: Web Environment',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3'
+    ],
+    tests_require=tests_requirements,
+    test_suite='social.tests',
+    zip_safe=False
+)