refactor: manually add transitions to f-strings

Author: consideRatio

docs/source/conf.py

@@ -61,12 +61,10 @@
 
 default_python = CondaBuildPack.major_pythons["3"]
 
-rst_prolog = """
+rst_prolog = f"""
 .. |default_python| replace:: **Python {default_python}**
 .. |default_python_version| replace:: {default_python}
-""".format(
-    default_python=default_python
-)
+"""
 
 
 # -- Options for HTML output -------------------------------------------------

repo2docker/__main__.py

@@ -304,8 +304,8 @@ def make_r2d(argv=None):
             r2d.volumes[os.path.abspath(args.repo)] = "."
         else:
             r2d.log.error(
-                'Cannot mount "{}" in editable mode '
-                "as it is not a directory".format(args.repo),
+                f'Cannot mount "{args.repo}" in editable mode '
+                "as it is not a directory",
                 extra=dict(phase=R2dState.FAILED),
             )
             sys.exit(1)

repo2docker/_version.py

@@ -293,7 +293,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
         mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe)
         if not mo:
             # unparseable. Maybe git-describe is misbehaving?
-            pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out
+            pieces["error"] = f"unable to parse git-describe output: '{describe_out}'"
             return pieces
 
         # tag
@@ -302,10 +302,9 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
             if verbose:
                 fmt = "tag '%s' doesn't start with prefix '%s'"
                 print(fmt % (full_tag, tag_prefix))
-            pieces["error"] = "tag '{}' doesn't start with prefix '{}'".format(
-                full_tag,
-                tag_prefix,
-            )
+            pieces[
+                "error"
+            ] = f"tag '{full_tag}' doesn't start with prefix '{tag_prefix}'"
             return pieces
         pieces["closest-tag"] = full_tag[len(tag_prefix) :]
 

repo2docker/app.py

@@ -425,9 +425,7 @@ def get_engine(self):
             entry = engines[self.engine]
         except KeyError:
             raise ContainerEngineException(
-                "Container engine '{}' not found. Available engines: {}".format(
-                    self.engine, ",".join(engines.keys())
-                )
+                f"Container engine '{self.engine}' not found. Available engines: {','.join(engines.keys())}"
             )
         engine_class = entry.load()
         return engine_class(parent=self)
@@ -447,16 +445,11 @@ def fetch(self, url, ref, checkout_path):
             spec = cp.detect(url, ref=ref)
             if spec is not None:
                 picked_content_provider = cp
-                self.log.info(
-                    "Picked {cp} content "
-                    "provider.\n".format(cp=cp.__class__.__name__)
-                )
+                self.log.info(f"Picked {cp.__class__.__name__} content provider.\n")
                 break
 
         if picked_content_provider is None:
-            self.log.error(
-                "No matching content provider found for " "{url}.".format(url=url)
-            )
+            self.log.error(f"No matching content provider found for {url}.")
 
         swh_token = self.config.get("swh_token", self.swh_token)
         if swh_token and isinstance(picked_content_provider, contentproviders.Swhid):
@@ -488,8 +481,7 @@ def json_excepthook(self, etype, evalue, traceback):
         Avoids non-JSON output on errors when using --json-logs
         """
         self.log.error(
-            "Error during build: %s",
-            evalue,
+            f"Error during build: {evalue}",
             exc_info=(etype, evalue, traceback),
             extra=dict(phase=R2dState.FAILED),
         )
@@ -619,11 +611,9 @@ def start_container(self):
             run_cmd = [
                 "jupyter",
                 "notebook",
-                "--ip",
-                "0.0.0.0",
-                "--port",
-                container_port,
-                f"--NotebookApp.custom_display_url=http://{host_name}:{host_port}"
+                "--ip=0.0.0.0",
+                f"--port={container_port}",
+                f"--NotebookApp.custom_display_url=http://{host_name}:{host_port}",
                 "--NotebookApp.default_url=/lab",
             ]
         else:
@@ -730,7 +720,7 @@ def build(self):
             try:
                 docker_client = self.get_engine()
             except ContainerEngineException as e:
-                self.log.error("\nContainer engine initialization error: %s\n", e)
+                self.log.error(f"\nContainer engine initialization error: {e}\n")
                 self.exit(1)
 
         # If the source to be executed is a directory, continue using the
@@ -751,8 +741,7 @@ def build(self):
 
             if self.find_image():
                 self.log.info(
-                    "Reusing existing image ({}), not "
-                    "building.".format(self.output_image_spec)
+                    f"Reusing existing image ({self.output_image_spec}), not building."
                 )
                 # no need to build, so skip to the end by `return`ing here
                 # this will still execute the finally clause and let's us
@@ -763,8 +752,7 @@ def build(self):
                 checkout_path = os.path.join(checkout_path, self.subdir)
                 if not os.path.isdir(checkout_path):
                     self.log.error(
-                        "Subdirectory %s does not exist",
-                        self.subdir,
+                        f"Subdirectory {self.subdir} does not exist",
                         extra=dict(phase=R2dState.FAILED),
                     )
                     raise FileNotFoundError(f"Could not find {checkout_path}")
@@ -808,8 +796,7 @@ def build(self):
                         )
 
                     self.log.info(
-                        "Using %s builder\n",
-                        bp.__class__.__name__,
+                        f"Using {bp.__class__.__name__} builder\n",
                         extra=dict(phase=R2dState.BUILDING),
                     )
 

repo2docker/buildpacks/_r_base.py

@@ -26,7 +26,7 @@ def rstudio_base_scripts(r_version):
             # we should have --no-install-recommends on all our apt-get install commands,
             # but here it's important because these recommend r-base,
             # which will upgrade the installed version of R, undoing our pinned version
-            r"""
+            rf"""
             curl --silent --location --fail {rstudio_url} > /tmp/rstudio.deb && \
             curl --silent --location --fail {shiny_server_url} > /tmp/shiny.deb && \
             echo '{rstudio_sha256sum} /tmp/rstudio.deb' | sha256sum -c - && \
@@ -37,24 +37,16 @@ def rstudio_base_scripts(r_version):
             apt-get -qq purge && \
             apt-get -qq clean && \
             rm -rf /var/lib/apt/lists/*
-            """.format(
-                rstudio_url=rstudio_url,
-                rstudio_sha256sum=rstudio_sha256sum,
-                shiny_server_url=shiny_server_url,
-                shiny_sha256sum=shiny_sha256sum,
-            ),
+            """,
         ),
         (
             "${NB_USER}",
             # Install jupyter-rsession-proxy
-            r"""
+            rf"""
                 pip install --no-cache \
                     jupyter-rsession-proxy=={rsession_proxy_version} \
                     jupyter-shiny-proxy=={shiny_proxy_version}
-                """.format(
-                rsession_proxy_version=rsession_proxy_version,
-                shiny_proxy_version=shiny_proxy_version,
-            ),
+                """,
         ),
         (
             # Not all of these locations are configurable; so we make sure

repo2docker/buildpacks/base.py

@@ -594,8 +594,8 @@ def _filter_tar(tar):
         # buildpacks/docker.py where it is duplicated
         if not isinstance(memory_limit, int):
             raise ValueError(
-                "The memory limit has to be specified as an"
-                "integer but is '{}'".format(type(memory_limit))
+                "The memory limit has to be specified as an "
+                f"integer but is '{type(memory_limit)}'"
             )
         limits = {}
         if memory_limit:
@@ -647,8 +647,7 @@ def get_preassemble_scripts(self):
                     # FIXME: Add support for specifying version numbers
                     if not re.match(r"^[a-z0-9.+-]+", package):
                         raise ValueError(
-                            "Found invalid package name {} in "
-                            "apt.txt".format(package)
+                            f"Found invalid package name {package} in apt.txt"
                         )
                     extra_apt_packages.append(package)
 

repo2docker/buildpacks/conda/__init__.py

@@ -341,15 +341,13 @@ def get_env_scripts(self):
             scripts.append(
                 (
                     "${NB_USER}",
-                    r"""
+                    rf"""
                 TIMEFORMAT='time: %3R' \
-                bash -c 'time ${{MAMBA_EXE}} env update -p {0} --file "{1}" && \
+                bash -c 'time ${{MAMBA_EXE}} env update -p {env_prefix} --file "{environment_yml}" && \
                 time ${{MAMBA_EXE}} clean --all -f -y && \
-                ${{MAMBA_EXE}} list -p {0} \
+                ${{MAMBA_EXE}} list -p {env_prefix} \
                 '
-                """.format(
-                        env_prefix, environment_yml
-                    ),
+                """,
                 )
             )
 
@@ -361,36 +359,30 @@ def get_env_scripts(self):
             scripts.append(
                 (
                     "${NB_USER}",
-                    r"""
-                ${{MAMBA_EXE}} install -p {0} r-base{1} r-irkernel r-devtools -y && \
+                    rf"""
+                ${{MAMBA_EXE}} install -p {env_prefix} r-base{r_pin} r-irkernel r-devtools -y && \
                 ${{MAMBA_EXE}} clean --all -f -y && \
-                ${{MAMBA_EXE}} list -p {0}
-                """.format(
-                        env_prefix, r_pin
-                    ),
+                ${{MAMBA_EXE}} list -p {env_prefix}
+                """,
                 )
             )
             scripts += rstudio_base_scripts(self.r_version)
             scripts += [
                 (
                     "root",
-                    r"""
+                    rf"""
                     echo auth-none=1 >> /etc/rstudio/rserver.conf && \
                     echo auth-minimum-user-id=0 >> /etc/rstudio/rserver.conf && \
-                    echo "rsession-which-r={}/bin/R" >> /etc/rstudio/rserver.conf && \
+                    echo "rsession-which-r={env_prefix}/bin/R" >> /etc/rstudio/rserver.conf && \
                     echo www-frame-origin=same >> /etc/rstudio/rserver.conf
-                    """.format(
-                        env_prefix
-                    ),
+                    """,
                 ),
                 (
                     "${NB_USER}",
                     # Register the jupyter kernel
-                    r"""
-                 R --quiet -e "IRkernel::installspec(prefix='{}')"
-                 """.format(
-                        env_prefix
-                    ),
+                    rf"""
+                 R --quiet -e "IRkernel::installspec(prefix='{env_prefix}')"
+                 """,
                 ),
             ]
         return scripts

repo2docker/buildpacks/docker.py

@@ -34,8 +34,8 @@ def build(
         # buildpacks/base.py where it is duplicated
         if not isinstance(memory_limit, int):
             raise ValueError(
-                "The memory limit has to be specified as an"
-                "integer but is '{}'".format(type(memory_limit))
+                "The memory limit has to be specified as an "
+                f"integer but is '{type(memory_limit)}'"
             )
         limits = {}
         if memory_limit:

repo2docker/buildpacks/nix/__init__.py

@@ -62,13 +62,11 @@ def get_assemble_scripts(self):
         return super().get_assemble_scripts() + [
             (
                 "${NB_USER}",
-                """
+                f"""
             nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs && \
             nix-channel --update && \
-            nix-shell {}
-            """.format(
-                    self.binder_path("default.nix")
-                ),
+            nix-shell {self.binder_path("default.nix")}
+            """,
             )
         ]
 

repo2docker/buildpacks/pipfile/__init__.py

@@ -123,9 +123,7 @@ def get_assemble_scripts(self):
                 assemble_scripts.append(
                     (
                         "${NB_USER}",
-                        '${{NB_PYTHON_PREFIX}}/bin/pip install --no-cache-dir -r "{}"'.format(
-                            nb_requirements_file
-                        ),
+                        f'${{NB_PYTHON_PREFIX}}/bin/pip install --no-cache-dir -r "{nb_requirements_file}"',
                     )
                 )