1.6 release

.travis.yml

@@ -4,12 +4,12 @@ python:
   - 3.3
   - 3.4
 env:
-  - DJANGO=django==1.6.5
-  - DJANGO=https://www.djangoproject.com/download/1.7c2/tarball/
+  - DJANGO="django>=1.7,<1.8"
+  - DJANGO="django>=1.8,<1.9"
 install:
   - pip install $DJANGO
   - pip install requests
   - python setup.py -q install
 script: python runtests.py
 notifications:
-  email: false
\ No newline at end of file
+  email: false

CHANGELOG

 django-ucamlookup changelog
 =============================
 
+1.6 - 09/10/2015
+------------------
+
+- Dropped support for django 1.6 (no longer supported by django project)
+- Added the option to retrieve the LookupGroup object using get_user_lookupgroups
+
+
 1.5 - 25/06/2015
 ------------------
 

debian/changelog

+django-ucamlookup (1.6) unstable; urgency=high
+
+  * Dropped support for django 1.6 (no longer supported by django project)
+  * Added the option to retrieve the LookupGroup object using get_user_lookupgroups
+
+ -- Abraham Martin <amc203@cam.ac.uk>  Fri, 9 Oct 2015 10:37:11 +0100
+
 django-ucamlookup (1.5) unstable; urgency=high
 
   * Updated ibisclient to 1.2.5

runtests.py

@@ -31,16 +31,9 @@ settings.configure(
 
 logging.basicConfig()
 
-if django.get_version().startswith('1.7'):
-    django.setup()
-    from django.test.runner import DiscoverRunner
-    test_runner = DiscoverRunner()
-elif django.get_version().startswith('1.6'):
-    from django.test.runner import DiscoverRunner
-    test_runner = DiscoverRunner()
-else:
-    from django.test.simple import DjangoTestSuiteRunner
-    test_runner = DjangoTestSuiteRunner(verbosity=1)
+django.setup()
+from django.test.runner import DiscoverRunner
+test_runner = DiscoverRunner()
 
 failures = test_runner.run_tests(['ucamlookup', ])
 if failures:

setup.py

@@ -8,13 +8,13 @@ setup(
     description='A Django module for the University of Cambridge Lookup service',
     long_description=open('README.rst').read(),
     url='https://git.csx.cam.ac.uk/x/ucs/u/amc203/django-ucamlookup.git',
-    version='1.5',
+    version='1.6',
     license='MIT',
     author='Information Systems Group, University Information Services, University of Cambridge',
     author_email='information-systems@ucs.cam.ac.uk',
     packages=find_packages(),
     include_package_data=True,
-    install_requires=['django>=1.6'],
+    install_requires=['django>=1.7'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',

ucamlookup/utils.py

@@ -64,7 +64,7 @@ def get_or_create_group_by_groupid(groupid):
     return group
 
 
-def get_user_lookupgroup(user):
+def get_user_lookupgroups(user):
     """ Returns the list of lookup groups of a user
     :param user: the User
     :return: the list of LookupGroups