Merge pull request #107 from NAL-i5K/fix_travis

Update chromedriver version in Travis

.travis.yml

@@ -33,9 +33,9 @@ install:
   - sudo pip2 install -r requirements.txt
   - sudo pip2 install coveralls
   - sudo pip2 install codecov
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://chromedriver.storage.googleapis.com/2.33/chromedriver_mac64.zip; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_mac64.zip; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then unzip chromedriver_mac64.zip; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://chromedriver.storage.googleapis.com/2.33/chromedriver_linux64.zip; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unzip chromedriver_linux64.zip; fi
   - export PATH=$PATH:$(pwd):/usr/local/sbin
 

app/views.py

@@ -21,12 +21,10 @@
 from .models import Profile
 from social.apps.django_app.default.models import UserSocialAuth
 from i5k.settings import DRUPAL_URL, DRUPAL_COOKIE_DOMAIN
-from drupal_sso.models import DrupalUserMapping
 from django.contrib.auth.models import User
 from django.utils.encoding import force_text
 from django.utils.http import urlsafe_base64_decode
-import urllib2
-import cookielib
+
 
 def home(request):
     assert isinstance(request, HttpRequest)

i5k/settings.py

@@ -149,8 +149,8 @@
     'app',
     'blast',
     # 'userprofile',
-    'suit', # Optional, Creative Commons Attribution-NonCommercial 3.0 license
-    #'grappelli',
+    'suit',  # Optional, Creative Commons Attribution-NonCommercial 3.0 license
+    # 'grappelli',
     'filebrowser',
     # Enable the admin:
     'django.contrib.admin',
@@ -162,8 +162,6 @@
     'proxy',
     'hmmer',
     'clustal',
-#    'drupal_sso',
-
 )
 
 

i5k/urls.py

@@ -29,7 +29,7 @@
     url(r'^info_change$', 'app.views.info_change', name='info_change'),
     url(r'^register$', 'app.views.register', name='register'),
     url(r'^login/$',
-        #'django.contrib.auth.views.logini',
+        # 'django.contrib.auth.views.login',
         login_forbidden(login),
         {
             'template_name': 'app/login.html',
@@ -99,7 +99,7 @@
         },
         name='password_change_done'),
     url(r'^password_change$',
-        #'django.contrib.auth.views.password_change',
+        # 'django.contrib.auth.views.password_change',
         'app.views.password_change',
         {
             'template_name': 'app/password_change.html',