diff --git a/README.rst b/README.rst index 6f753f8..dadd3db 100644 --- a/README.rst +++ b/README.rst @@ -19,6 +19,10 @@ use any sources (see auth classes in the auth.py file) The defaut login/logout template use `django-bootstrap3 `_ but you can use your own templates using settings variables. +Note that for Django 1.7 compatibility, you need a version of +`django-bootstrap3 `_ < 7.0.0 +like the 6.2.2 version. + Features -------- diff --git a/setup.py b/setup.py index 37d00c4..9302269 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ import os +import pkg_resources from setuptools import setup with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme: @@ -7,6 +8,23 @@ with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme: # allow setup.py to be run from any path os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) + +# if we have Django 1.8 available, use last version of django-boostrap3 +try: + pkg_resources.require('Django >= 1.8') + django_bootstrap3 = 'django-bootstrap3 >= 5.4' + django = 'Django >= 1.8,<1.10' +except pkg_resources.VersionConflict: + # Else if we have django 1.7, we need django-boostrap3 < 7.0.0 + try: + pkg_resources.require('Django >= 1.7') + django_bootstrap3 = 'django-bootstrap3 >= 5.4,<7.0.0' + django = 'Django >= 1.7,<1.8' + except pkg_resources.VersionConflict: + # Else we need to install Django, assume version will be >= 1.8 + django_bootstrap3 = 'django-bootstrap3 >= 5.4' + django = 'Django >= 1.8,<1.10' + setup( name='django-cas-server', version='0.4.1', @@ -44,8 +62,8 @@ setup( }, keywords=['django', 'cas', 'cas3', 'server', 'sso', 'single sign-on', 'authentication', 'auth'], install_requires=[ - 'Django >= 1.7,<1.10', 'requests >= 2.4', 'requests_futures >= 0.9.5', - 'django-picklefield >= 0.3.1', 'django-bootstrap3 >= 5.4', 'lxml >= 3.4' + django, 'requests >= 2.4', 'requests_futures >= 0.9.5', + 'django-picklefield >= 0.3.1', django_bootstrap3, 'lxml >= 3.4' ], url="https://github.com/nitmir/django-cas-server", download_url="https://github.com/nitmir/django-cas-server/releases",