Merge remote-tracking branch 'upstream/main' into conda-channels

tljh/hooks.py

@@ -12,7 +12,6 @@ def tljh_extra_user_conda_packages():
     """
     Return list of extra conda packages to install in user environment.
     """
-    pass
 
 
 @hookspec
@@ -28,7 +27,6 @@ def tljh_extra_user_pip_packages():
     """
     Return list of extra pip packages to install in user environment.
     """
-    pass
 
 
 @hookspec
@@ -36,7 +34,6 @@ def tljh_extra_hub_pip_packages():
     """
     Return list of extra pip packages to install in the hub environment.
     """
-    pass
 
 
 @hookspec
@@ -46,7 +43,6 @@ def tljh_extra_apt_packages():
 
     These will be installed before additional pip or conda packages.
     """
-    pass
 
 
 @hookspec
@@ -57,7 +53,6 @@ def tljh_custom_jupyterhub_config(c):
     Anything you can put in `jupyterhub_config.py` can
     be here.
     """
-    pass
 
 
 @hookspec
@@ -70,7 +65,6 @@ def tljh_config_post_install(config):
     be the serialized contents of config, so try to not
     overwrite anything the user might have explicitly set.
     """
-    pass
 
 
 @hookspec
@@ -81,7 +75,6 @@ def tljh_post_install():
 
     This can be arbitrary Python code.
     """
-    pass
 
 
 @hookspec
@@ -90,4 +83,3 @@ def tljh_new_user_create(username):
     Script to be executed after a new user has been added.
     This can be arbitrary Python code.
     """
-    pass