Skip to content

Commit 3f55ac2

Browse files
committed
Drop support for ubuntu 20.04 and Python 3.8
1 parent 92465ad commit 3f55ac2

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

.github/workflows/integration-test.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ jobs:
3939
- name: "Debian 12, Py 3.11"
4040
distro_image: "debian:12"
4141
extra_flags: ""
42-
- name: "Ubuntu 20.04, Py 3.8"
43-
distro_image: "ubuntu:20.04"
44-
extra_flags: ""
4542
- name: "Ubuntu 22.04 Py 3.10"
4643
distro_image: "ubuntu:22.04"
4744
extra_flags: ""

bootstrap/bootstrap.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
1010
Constraints:
1111
12-
- The entire script should be compatible with Python 3.8, which is the default on
13-
Ubuntu 20.04.
14-
- The script should parse in Python 3.6 as we print error messages for using
15-
Ubuntu 18.04 which comes with Python 3.6 by default.
12+
- The entire script should be compatible with Python 3.9, which is the default on
13+
Debian 11.
14+
- The script should parse in Python 3.8 as we print error messages for using
15+
Ubuntu 20.04 which comes with Python 3.8 by default.
1616
- The script must depend only on stdlib modules, as no previous installation
1717
of dependencies can be assumed.
1818
@@ -210,22 +210,22 @@ def ensure_host_system_can_install_tljh():
210210
Check if TLJH is installable in current host system and exit with a clear
211211
error message otherwise.
212212
"""
213-
# Require Ubuntu 20.04+ or Debian 11+
213+
# Require Ubuntu 22.04+ or Debian 11+
214214
distro = get_os_release_variable("ID")
215215
version = get_os_release_variable("VERSION_ID")
216216
if distro not in ["ubuntu", "debian"]:
217217
print("The Littlest JupyterHub currently supports Ubuntu or Debian Linux only")
218218
sys.exit(1)
219-
elif distro == "ubuntu" and _parse_version(version) < (20, 4):
220-
print("The Littlest JupyterHub requires Ubuntu 20.04 or higher")
219+
elif distro == "ubuntu" and _parse_version(version) < (22, 4):
220+
print("The Littlest JupyterHub requires Ubuntu 22.04 or higher")
221221
sys.exit(1)
222222
elif distro == "debian" and _parse_version(version) < (11,):
223223
print("The Littlest JupyterHub requires Debian 11 or higher")
224224
sys.exit(1)
225225

226-
# Require Python 3.8+
227-
if sys.version_info < (3, 8):
228-
print(f"bootstrap.py must be run with at least Python 3.8, found {sys.version}")
226+
# Require Python 3.9+
227+
if sys.version_info < (3, 9):
228+
print(f"bootstrap.py must be run with at least Python 3.9, found {sys.version}")
229229
sys.exit(1)
230230

231231
# Require systemd (systemctl is a part of systemd)

integration-tests/test_bootstrap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ def test_ubuntu_too_old():
8585
"""
8686
Error with a useful message when running in older Ubuntu
8787
"""
88-
output = _run_bootstrap_in_container("ubuntu:18.04", False)
88+
output = _run_bootstrap_in_container("ubuntu:20.04", False)
8989
_stop_container()
90-
assert output.stdout == "The Littlest JupyterHub requires Ubuntu 20.04 or higher\n"
90+
assert output.stdout == "The Littlest JupyterHub requires Ubuntu 22.04 or higher\n"
9191
assert output.returncode == 1
9292

9393

0 commit comments

Comments
 (0)