For django 1.7 compatibility we need django-boostrap3 < 7.0.0
This commit is contained in:
		@@ -19,6 +19,10 @@ use any sources (see auth classes in the auth.py file)
 | 
				
			|||||||
The defaut login/logout template use `django-bootstrap3 <https://github.com/dyve/django-bootstrap3>`_
 | 
					The defaut login/logout template use `django-bootstrap3 <https://github.com/dyve/django-bootstrap3>`_
 | 
				
			||||||
but you can use your own templates using settings variables.
 | 
					but you can use your own templates using settings variables.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Note that for Django 1.7 compatibility, you need a version of
 | 
				
			||||||
 | 
					`django-bootstrap3 <https://github.com/dyve/django-bootstrap3>`_ < 7.0.0
 | 
				
			||||||
 | 
					like the 6.2.2 version.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Features
 | 
					Features
 | 
				
			||||||
--------
 | 
					--------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										22
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								setup.py
									
									
									
									
									
								
							@@ -1,4 +1,5 @@
 | 
				
			|||||||
import os
 | 
					import os
 | 
				
			||||||
 | 
					import pkg_resources
 | 
				
			||||||
from setuptools import setup
 | 
					from setuptools import setup
 | 
				
			||||||
 | 
					
 | 
				
			||||||
with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
 | 
					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
 | 
					# allow setup.py to be run from any path
 | 
				
			||||||
os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 | 
					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(
 | 
					setup(
 | 
				
			||||||
    name='django-cas-server',
 | 
					    name='django-cas-server',
 | 
				
			||||||
    version='0.4.1',
 | 
					    version='0.4.1',
 | 
				
			||||||
@@ -44,8 +62,8 @@ setup(
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    keywords=['django', 'cas', 'cas3', 'server', 'sso', 'single sign-on', 'authentication', 'auth'],
 | 
					    keywords=['django', 'cas', 'cas3', 'server', 'sso', 'single sign-on', 'authentication', 'auth'],
 | 
				
			||||||
    install_requires=[
 | 
					    install_requires=[
 | 
				
			||||||
        'Django >= 1.7,<1.10', 'requests >= 2.4', 'requests_futures >= 0.9.5',
 | 
					        django, 'requests >= 2.4', 'requests_futures >= 0.9.5',
 | 
				
			||||||
        'django-picklefield >= 0.3.1', 'django-bootstrap3 >= 5.4', 'lxml >= 3.4'
 | 
					        'django-picklefield >= 0.3.1', django_bootstrap3, 'lxml >= 3.4'
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    url="https://github.com/nitmir/django-cas-server",
 | 
					    url="https://github.com/nitmir/django-cas-server",
 | 
				
			||||||
    download_url="https://github.com/nitmir/django-cas-server/releases",
 | 
					    download_url="https://github.com/nitmir/django-cas-server/releases",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user