s/bionic/focal/ and hope

repo2docker/buildpacks/r.py

@@ -67,14 +67,14 @@ def r_version(self):
  """
  version_map = {
  "3.4": "3.4",
- "3.5": "3.5.3-1bionic",
- "3.5.0": "3.5.0-1bionic",
- "3.5.1": "3.5.1-2bionic",
- "3.5.2": "3.5.2-1bionic",
- "3.5.3": "3.5.3-1bionic",
- "3.6": "3.6.1-3bionic",
- "3.6.0": "3.6.0-2bionic",
- "3.6.1": "3.6.1-3bionic",
+ "3.5": "3.5.3-1focal",
+ "3.5.0": "3.5.0-1focal",
+ "3.5.1": "3.5.1-2focal",
+ "3.5.2": "3.5.2-1focal",
+ "3.5.3": "3.5.3-1focal",
+ "3.6": "3.6.1-3focal",
+ "3.6.0": "3.6.0-2focal",
+ "3.6.1": "3.6.1-3focal",
  "4.0": "4.0.2-1.1804.0",
  "4.0.2": "4.0.2-1.1804.0",
  }
@@ -244,7 +244,7 @@ def get_build_scripts(self):
  (
  "root",
  rf"""
- echo "deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran{vs}/" > /etc/apt/sources.list.d/r-ubuntu.list
+ echo "deb https://cloud.r-project.org/bin/linux/ubuntu focal-cran{vs}/" > /etc/apt/sources.list.d/r-ubuntu.list
  """,
  ),
  # Dont use apt-key directly, as gpg does not always respect *_proxy vars. This increase the chances

tests/unit/test_r.py

@@ -43,7 +43,7 @@ def test_version_completion(tmpdir):
  f.write(f"r-3.6-2019-01-01")
 
  r = buildpacks.RBuildPack()
- assert r.r_version == "3.6.1-3bionic"
+ assert r.r_version == "3.6.1-3focal"
 
 
 @pytest.mark.parametrize(
@@ -122,7 +122,7 @@ def test_custom_ppa(tmpdir):
 
  # check that at least one of the build scripts adds this new PPA
  for user, script in scripts:
- if "https://cloud.r-project.org/bin/linux/ubuntu bionic-cran35/" in script:
+ if "https://cloud.r-project.org/bin/linux/ubuntu focal-cran35/" in script:
  break
  else:
  assert False, "Should have added a new PPA"