Updated setup.py file to install properly, added version to social_auth module

diff --git a/setup.py b/setup.py
index ce37f9a55ac9021bce73b42b152d0fa6ed2d1ba2..bd558ed4839e30a84cc48cca9f6b0a2e5c1a5888 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,24 +4,45 @@ from os.path import join, dirname
 from setuptools import setup
 
 
+version = __import__('social_auth').__version__
+
+LONG_DESCRIPTION = """
+Django Social Auth is an easy to setup social authentication/registration
+mechanism for Django projects.
+
+Crafted using base code from django-twitter-oauth_ and django-openid-auth_,
+implements a common interface to define new authentication providers from
+third parties.
+"""
+
+def long_description():
+    """Return long description from README.rst if it's present
+    because it doesn't get installed."""
+    try:
+        return open(join(dirname(__file__), 'README.rst')).read()
+    except IOError:
+        return LONG_DESCRIPTION
+
+
 setup(name='django-social-auth',
-      version='0.1',
+      version=version,
       author='Matías Aguirre',
       author_email='matiasaguirre@gmail.com',
       description='Django social authentication made simple.',
       license='GPL',
       keywords='django, openid, oath, social auth, application',
       url='https://github.com/omab/django-social-auth',
-      download_url='git+git://github.com/omab/django-social-auth.git#egg=django-social-auth',
       packages=['social_auth'],
-      long_description=open(join(dirname(__file__), 'README.rst')).read(),
-      requires=['django (>=1.2)',
-                'oauth (>=1.0)',
-                'python_openid (>=2.2)'],
+      long_description=long_description(),
+      install_requires=['django>=1.2',
+                        'oauth>=1.0',
+                        'python_openid>=2.2'],
       classifiers=['Framework :: Django',
                    'Development Status :: 4 - Beta',
                    'Topic :: Internet',
                    'License :: OSI Approved :: GNU General Public License (GPL)',
                    'Intended Audience :: Developers',
                    'Environment :: Web Environment',
-                   'Programming Language :: Python'])
+                   'Programming Language :: Python :: 2.5',
+                   'Programming Language :: Python :: 2.6',
+                   'Programming Language :: Python :: 2.7'])

diff --git a/social_auth/__init__.py b/social_auth/__init__.py
index a6eb31519605ce91ae094d8b272cc17beab27189..537fd89cf43ba75598a44c8ba5866880ff3a3a37 100644 (file)
--- a/social_auth/__init__.py
+++ b/social_auth/__init__.py
@@ -2,3 +2,5 @@
 Django-social-auth application, allows OpenId or OAuth user
 registration/authentication just adding a few configurations.
 """
+version = (0, 1, 0)
+__version__ = '.'.join(map(str, version))