Merge pull request #838 from manics/release

Release 0.2.0 (JupyterHub 1.*)

bootstrap/bootstrap.py

@@ -335,7 +335,14 @@ def main():
     parser = ArgumentParser()
     parser.add_argument("--show-progress-page", action="store_true")
     parser.add_argument(
-        "--version", default="main", help="TLJH version or Git reference"
+        "--version",
+        default="latest",
+        help=(
+            "TLJH version or Git reference. "
+            "Default 'latest' is the most recent release. "
+            "Partial versions can be specified, for example '1', '1.0' or '1.0.0'. "
+            "You can also pass a branch name such as 'main' or a commit hash."
+        ),
     )
     args, tljh_installer_flags = parser.parse_known_args()
 
@@ -448,16 +455,16 @@ def main():
     if os.environ.get("TLJH_BOOTSTRAP_DEV", "no") == "yes":
         logger.info("Selected TLJH_BOOTSTRAP_DEV=yes...")
         tljh_install_cmd.append("--editable")
-    version = _resolve_git_version(args.version)
 
-    tljh_install_cmd.append(
+    bootstrap_pip_spec = os.environ.get("TLJH_BOOTSTRAP_PIP_SPEC")
-        os.environ.get(
+    if not bootstrap_pip_spec:
-            "TLJH_BOOTSTRAP_PIP_SPEC",
+        bootstrap_pip_spec = (
             "git+https://github.com/jupyterhub/the-littlest-jupyterhub.git@{}".format(
-                version
+                _resolve_git_version(args.version)
-            ),
+            )
         )
-    )
+
+    tljh_install_cmd.append(bootstrap_pip_spec)
     if initial_setup:
         logger.info("Installing TLJH installer...")
     else:

integration-tests/test_bootstrap.py

@@ -100,7 +100,14 @@ def run_bootstrap_after_preparing_container(
 
     bootstrap_script = get_bootstrap_script_location(container_name, show_progress_page)
 
-    exec_flags = ["-i", container_name, "python3", bootstrap_script]
+    exec_flags = [
+        "-i",
+        container_name,
+        "python3",
+        bootstrap_script,
+        "--version",
+        "main",
+    ]
     if show_progress_page:
         exec_flags = (
             ["-e", "TLJH_BOOTSTRAP_DEV=yes", "-e", "TLJH_BOOTSTRAP_PIP_SPEC=/srv/src"]

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="the-littlest-jupyterhub",
-    version="0.1",
+    version="0.2.0",
     description="A small JupyterHub distribution",
     url="https://github.com/jupyterhub/the-littlest-jupyterhub",
     author="Jupyter Development Team",