Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use idle culler from jupyterhub-idle-culler package #559

Merged
merged 4 commits into from
May 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/integration-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_configurer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
Expand All @@ -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'
]
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tljh/configurer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
342 changes: 0 additions & 342 deletions tljh/cull_idle_servers.py

This file was deleted.

1 change: 1 addition & 0 deletions tljh/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down