Update jupyterhub to version 1.0.0 (#609)

* MAINT: update jupyterhub version to 1.0.0

* DEV: use JupyterHub.shutdown_on_logout configuration

* TST: fix mocking failures on unit tests

* CLN: remove SimphonyRemoteAuthMixin class since it is no longer requried to close user sessions upon logout

Author: flongford

jupyterhub/jupyterhub_config.py

@@ -17,6 +17,10 @@
 # Choose between system-user mode and virtual-user mode
 setting_mode = ('system_user', 'virtual_user')[1]
 
+# Ensures user sessions are closed upon logout - this is especially
+# useful for admin users to switch between user and admin apps
+c.JupyterHub.shutdown_on_logout = True
+
 if setting_mode == 'virtual_user':
     c.JupyterHub.spawner_class = ('remoteappmanager.jupyterhub.spawners.'
                                   'VirtualUserSpawner')

remoteappmanager/jupyterhub/auth/__init__.py

@@ -1,4 +1,3 @@
 from .world_authenticator import WorldAuthenticator  # noqa
 from .basic_authenticator import BasicAuthenticator  # noqa
 from .github_whitelist_authenticator import GitHubWhitelistAuthenticator  # noqa
-from .simphony_remote_auth_mixin import SimphonyRemoteAuthMixin  # noqa

remoteappmanager/jupyterhub/auth/basic_authenticator.py

@@ -3,10 +3,8 @@
 from jupyterhub.auth import Authenticator
 from traitlets import Dict
 
-from .simphony_remote_auth_mixin import SimphonyRemoteAuthMixin
 
-
-class BasicAuthenticator(SimphonyRemoteAuthMixin, Authenticator):
+class BasicAuthenticator(Authenticator):
     """ Simple authenticator based on a fixed set of users"""
 
     #: Dictionary of regular username: password keys allowed

remoteappmanager/jupyterhub/auth/github_whitelist_authenticator.py

@@ -3,8 +3,6 @@
 from traitlets.config import LoggingConfigurable
 from traitlets import Unicode, Float, Set
 
-from .simphony_remote_auth_mixin import SimphonyRemoteAuthMixin
-
 
 class FileWhitelistMixin(LoggingConfigurable):
     """
@@ -61,8 +59,7 @@ def whitelist(self, value):
         pass
 
 
-class GitHubWhitelistAuthenticator(
-        SimphonyRemoteAuthMixin, FileWhitelistMixin, GitHubOAuthenticator):
+class GitHubWhitelistAuthenticator(FileWhitelistMixin, GitHubOAuthenticator):
     """A github authenticator that also verifies that the
     user belongs to a specified whitelisted user as provided
     by an external file (so that we don't have to restart

remoteappmanager/jupyterhub/auth/simphony_remote_auth_mixin.py

@@ -5,10 +5,8 @@
 
 from jupyterhub.auth import Authenticator
 
-from .simphony_remote_auth_mixin import SimphonyRemoteAuthMixin
 
-
-class WorldAuthenticator(SimphonyRemoteAuthMixin, Authenticator):
+class WorldAuthenticator(Authenticator):
     """ This authenticator authenticates everyone """
 
     @gen.coroutine

remoteappmanager/jupyterhub/auth/world_authenticator.py

@@ -49,6 +49,7 @@ def new_spawner(spawner_class):
     # Mock user
     user = mock.Mock()
     user.name = username()
+    user.escaped_name = user.name
     user.url = 'http://my-callback.com'
     user.admin = False
     user.state = None

remoteappmanager/jupyterhub/tests/test_spawners.py

@@ -4,7 +4,7 @@ tornado==5.1.1
 requests==2.20.0
 docker==2.2
 escapism==0.0.1
-jupyterhub==0.9.6
+jupyterhub==1.0.0
 jupyter_client>=4.3.0
 click==6.6
 tabulate==0.7.5