Merge pull request #559 from yuvipanda/feat/upstream-culler

Use idle culler from jupyterhub-idle-culler package

.circleci/integration-test.py

@@ -32,7 +32,7 @@ def run_systemd_image(image_name, container_name, bootstrap_pip_spec):
         # This is the minimum VM size we support. JupyterLab extensions seem
         # to need at least this much RAM to build. Boo?
         # If we change this, need to change all other references to this number.
-        '--memory', '1G',
+        '--memory', '1.0G',
     ]
 
     if bootstrap_pip_spec:

tests/test_configurer.py

@@ -213,7 +213,7 @@ def test_cull_service_default():
     c = apply_mock_config({})
 
     cull_cmd = [
-       sys.executable, '-m', 'tljh.cull_idle_servers',
+       sys.executable, '-m', 'jupyterhub_idle_culler',
        '--timeout=600', '--cull-every=60', '--concurrency=5',
        '--max-age=0'
     ]
@@ -238,7 +238,7 @@ def test_set_cull_service():
         }
     })
     cull_cmd = [
-       sys.executable, '-m', 'tljh.cull_idle_servers',
+       sys.executable, '-m', 'jupyterhub_idle_culler',
        '--timeout=600', '--cull-every=10', '--concurrency=5',
        '--max-age=60', '--cull-users'
     ]
@@ -261,7 +261,7 @@ def test_load_secrets(tljh_dir):
     c = apply_mock_config(tljh_config)
     assert c.TraefikTomlProxy.traefik_api_password == "traefik-password"
 
-    
+
 def test_auth_native():
     """
     Test setting Native Authenticator

tljh/configurer.py

@@ -218,7 +218,7 @@ def set_cull_idle_service(config):
     Set Idle Culler service
     """
     cull_cmd = [
-       sys.executable, '-m', 'tljh.cull_idle_servers'
+       sys.executable, '-m', 'jupyterhub_idle_culler'
     ]
     cull_config = config['services']['cull']
     print()

tljh/installer.py

@@ -225,6 +225,7 @@ def ensure_jupyterhub_package(prefix):
         'jupyterhub-ldapauthenticator==1.3.0',
         'jupyterhub-tmpauthenticator==0.6',
         'oauthenticator==0.10.0',
+        'jupyterhub-idle-culler==1.0'
     ])
     traefik.ensure_traefik_binary(prefix)