Update Dependencies (#953)

* upgrade six version to 1.11.0

This is to keep it the same as the version of Django we are using and the portal version

* set version

* fix syntax error

* remove other version argument

* upgrade django patch version

* use versioneer version

* Temporarily use beta_users branch for portal install until it is merged in

* Use latest version of setuptools (Ubuntu version is too old)

.travis.yml

@@ -41,8 +41,9 @@ matrix:
 before_install:
   - gem install sass -v 3.3.4
 install:
+  - pip install -U setuptools
   - pip install -e .
-  - pip install -e git+https://github.com/ocadotechnology/codeforlife-portal.git#egg=codeforlife-portal #TODO: Remove as part of #688
+  - pip install -e git+https://github.com/ocadotechnology/codeforlife-portal.git@beta_users#egg=codeforlife-portal #TODO: Remove as part of #688
   - pip install coveralls
   - pip install crowdin-cli-py
 before_script:

setup.py

@@ -7,7 +7,7 @@
     packages=find_packages(),
     include_package_data=True,
     install_requires = [
-        'django==1.8.2',
+        'django==1.8.3',
         'django-foundation-icons==3.1',
         'django-bourbon==3.1.8',
         'django-autoconfig==0.3.6',
@@ -18,7 +18,7 @@
         'django-appconf==1.0.1',
         'django-casper==0.0.3',
         'djangorestframework==3.1.3',
-        'six==1.9.0',
+        'six==1.11.0',
         'docutils==0.12',
         'pyhamcrest==1.8.3',
     ],