Merge lp:~ricardokirkner/django-openid-auth/use-setuptools into lp:~django-openid-auth/django-openid-auth/trunk

[Ricardo Kirkner]

replace distutils by setuptools

use setuptools so wheels can be built

[Ricardo Kirkner (ricardokirkner)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:django-openid-auth failed due to conflicts:

text conflict in setup.py

=== modified file 'setup.py'
--- setup.py	2015-04-24 13:22:59 +0000
+++ setup.py	2015-09-08 20:46:55 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2013 Canonical Ltd.
+# Copyright (C) 2009-2015 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -39,7 +39,7 @@
     info.
 """
 
-from distutils.core import setup
+from setuptools import find_packages, setup
 
 
 description, long_description = __doc__.split('\n\n', 1)
@@ -48,6 +48,18 @@
 setup(
     name='django-openid-auth',
     version=VERSION,
+
+    packages=find_packages(),
+    install_requires=[
+        'django>=1.4',
+        'python-openid>=2.2.0',
+        'south',
+    ],
+    package_data={
+        'django_openid_auth': ['templates/openid/*.html'],
+    },
+
+    # metadata for upload to PyPI
     author='Canonical Ltd',
     author_email='[e-mail]',
     description=description,
@@ -58,7 +70,7 @@
     download_url=('http://launchpad.net/django-openid-auth/trunk/%s/+download'
                   '/django-openid-auth-%s.tar.gz' % (VERSION, VERSION)),
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
         'Intended Audience :: Developers',
@@ -67,15 +79,4 @@
         'Programming Language :: Python',
         'Topic :: Software Development :: Libraries :: Python Modules'
         ],
-    packages=[
-        'django_openid_auth',
-        'django_openid_auth.management',
-        'django_openid_auth.management.commands',
-        'django_openid_auth.tests',
-        ],
-    package_data={
-        'django_openid_auth': ['templates/openid/*.html'],
-        },
-    provides=['django_openid_auth'],
-    requires=['django (>=1.4)', 'openid (>=2.2.0)', 'south'],
-    )
+)