From 625b2967739ef2d1a1936c701d87671d3a05ce7c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 20:26:53 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 23.12.1 → 24.1.1](https://github.com/psf/black/compare/23.12.1...24.1.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3637eb24..a4bbbe68 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: # Autoformat: Python code - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 24.1.1 hooks: - id: black args: From f2c1cb7a8c27726450a6bbbded5099478c8a8994 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 20:28:56 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- repo2docker/app.py | 1 + repo2docker/buildpacks/_r_base.py | 1 + repo2docker/buildpacks/conda/__init__.py | 25 ++++++++++--------- repo2docker/buildpacks/docker.py | 1 + repo2docker/buildpacks/julia/julia_project.py | 1 + repo2docker/buildpacks/julia/julia_require.py | 2 +- repo2docker/buildpacks/legacy/__init__.py | 1 + repo2docker/buildpacks/nix/__init__.py | 1 + repo2docker/buildpacks/pipfile/__init__.py | 8 +++--- repo2docker/buildpacks/python/__init__.py | 1 + repo2docker/contentproviders/base.py | 1 + repo2docker/semver.py | 1 - tests/unit/test_args.py | 1 + tests/unit/test_clone_depth.py | 1 + tests/unit/test_connect_url.py | 1 + tests/unit/test_env.py | 1 + tests/unit/test_external_scripts.py | 1 + tests/unit/test_labels.py | 1 + tests/unit/test_subdir.py | 1 + tests/unit/test_users.py | 1 + tests/unit/test_utils.py | 1 + 21 files changed, 36 insertions(+), 17 deletions(-) diff --git a/repo2docker/app.py b/repo2docker/app.py index 63643da2..c7f3ab81 100755 --- a/repo2docker/app.py +++ b/repo2docker/app.py @@ -7,6 +7,7 @@ Usage: python -m repo2docker https://github.com/you/your-repo """ + import getpass import json import logging diff --git a/repo2docker/buildpacks/_r_base.py b/repo2docker/buildpacks/_r_base.py index 8c87f63f..de2b7fcb 100644 --- a/repo2docker/buildpacks/_r_base.py +++ b/repo2docker/buildpacks/_r_base.py @@ -3,6 +3,7 @@ Base information for using R in BuildPacks. Keeping this in r.py would lead to cyclic imports. """ + from ..semver import parse_version as V diff --git a/repo2docker/buildpacks/conda/__init__.py b/repo2docker/buildpacks/conda/__init__.py index aed5de6f..2a3e694d 100644 --- a/repo2docker/buildpacks/conda/__init__.py +++ b/repo2docker/buildpacks/conda/__init__.py @@ -1,4 +1,5 @@ """BuildPack for conda environments""" + import os import re import warnings @@ -193,15 +194,15 @@ class CondaBuildPack(BaseImage): raise ValueError( f"Python version {py_version} on {conda_platform} is not supported!" ) - files[ - f"conda/{lockfile_name}" - ] = self._kernel_environment_file = "/tmp/env/kernel-environment.lock" + files[f"conda/{lockfile_name}"] = self._kernel_environment_file = ( + "/tmp/env/kernel-environment.lock" + ) requirements_file_name = f"requirements.py-{py_version}.pip" if os.path.exists(os.path.join(HERE, requirements_file_name)): - files[ - f"conda/{requirements_file_name}" - ] = self._kernel_requirements_file = "/tmp/env/kernel-requirements.txt" + files[f"conda/{requirements_file_name}"] = ( + self._kernel_requirements_file + ) = "/tmp/env/kernel-requirements.txt" else: # server and kernel are the same server_py_version = py_version @@ -216,15 +217,15 @@ class CondaBuildPack(BaseImage): f"Python version {server_py_version} on {conda_platform} is not supported!" ) - files[ - "conda/" + conda_frozen_name - ] = self._nb_environment_file = "/tmp/env/environment.lock" + files["conda/" + conda_frozen_name] = self._nb_environment_file = ( + "/tmp/env/environment.lock" + ) # add requirements.txt, if present if os.path.exists(os.path.join(HERE, pip_frozen_name)): - files[ - "conda/" + pip_frozen_name - ] = self._nb_requirements_file = "/tmp/env/requirements.txt" + files["conda/" + pip_frozen_name] = self._nb_requirements_file = ( + "/tmp/env/requirements.txt" + ) files.update(super().get_build_script_files()) return files diff --git a/repo2docker/buildpacks/docker.py b/repo2docker/buildpacks/docker.py index d1dfe492..9185307a 100644 --- a/repo2docker/buildpacks/docker.py +++ b/repo2docker/buildpacks/docker.py @@ -1,5 +1,6 @@ """Generates a variety of Dockerfiles based on an input matrix """ + import os import docker diff --git a/repo2docker/buildpacks/julia/julia_project.py b/repo2docker/buildpacks/julia/julia_project.py index 7b6771c2..0985a33e 100644 --- a/repo2docker/buildpacks/julia/julia_project.py +++ b/repo2docker/buildpacks/julia/julia_project.py @@ -1,4 +1,5 @@ """Generates a Dockerfile based on an input matrix for Julia""" + import functools import os from functools import lru_cache diff --git a/repo2docker/buildpacks/julia/julia_require.py b/repo2docker/buildpacks/julia/julia_require.py index ab41ffc2..cfea1344 100644 --- a/repo2docker/buildpacks/julia/julia_require.py +++ b/repo2docker/buildpacks/julia/julia_require.py @@ -175,7 +175,7 @@ class JuliaRequireBuildPack(PythonBuildPack): r""" julia /tmp/install-repo-dependencies.jl "%(require)s" """ - % {"require": require} + % {"require": require}, # TODO: For some reason, `rm`ing the file fails with permission denied. # && rm /tmp/install-repo-dependencies.jl ) diff --git a/repo2docker/buildpacks/legacy/__init__.py b/repo2docker/buildpacks/legacy/__init__.py index 31980f9f..36bdb8f2 100644 --- a/repo2docker/buildpacks/legacy/__init__.py +++ b/repo2docker/buildpacks/legacy/__init__.py @@ -7,6 +7,7 @@ and IPython kernel. Note: This buildpack has been deprecated. """ + import logging diff --git a/repo2docker/buildpacks/nix/__init__.py b/repo2docker/buildpacks/nix/__init__.py index 94fd7b7c..7da3be60 100644 --- a/repo2docker/buildpacks/nix/__init__.py +++ b/repo2docker/buildpacks/nix/__init__.py @@ -1,4 +1,5 @@ """BuildPack for nixpkgs environments""" + import os from functools import lru_cache diff --git a/repo2docker/buildpacks/pipfile/__init__.py b/repo2docker/buildpacks/pipfile/__init__.py index 4b86eed1..cb6d1ef2 100644 --- a/repo2docker/buildpacks/pipfile/__init__.py +++ b/repo2docker/buildpacks/pipfile/__init__.py @@ -173,9 +173,11 @@ class PipfileBuildPack(CondaBuildPack): pipenv --clear \\ )""".format( working_directory=working_directory, - install_option="--ignore-pipfile" - if os.path.exists(pipfile_lock) - else "--skip-lock", + install_option=( + "--ignore-pipfile" + if os.path.exists(pipfile_lock) + else "--skip-lock" + ), ), ) ) diff --git a/repo2docker/buildpacks/python/__init__.py b/repo2docker/buildpacks/python/__init__.py index 188e8e9c..36740795 100644 --- a/repo2docker/buildpacks/python/__init__.py +++ b/repo2docker/buildpacks/python/__init__.py @@ -1,4 +1,5 @@ """Generates Dockerfiles based on an input matrix based on Python.""" + import os from functools import lru_cache diff --git a/repo2docker/contentproviders/base.py b/repo2docker/contentproviders/base.py index 672c3973..45baf272 100644 --- a/repo2docker/contentproviders/base.py +++ b/repo2docker/contentproviders/base.py @@ -4,6 +4,7 @@ Base classes for repo2docker ContentProviders ContentProviders accept a `spec` of various kinds, and provide the contents from the spec to a given output directory. """ + import logging import os diff --git a/repo2docker/semver.py b/repo2docker/semver.py index d0a2a5b8..97650fa6 100644 --- a/repo2docker/semver.py +++ b/repo2docker/semver.py @@ -10,7 +10,6 @@ matcher functors take a version string and return True if it passes its constraints. """ - import re from functools import lru_cache diff --git a/tests/unit/test_args.py b/tests/unit/test_args.py index 53913d94..d3e304f0 100644 --- a/tests/unit/test_args.py +++ b/tests/unit/test_args.py @@ -1,6 +1,7 @@ """ Test argument parsing and r2d construction """ + import os import pytest diff --git a/tests/unit/test_clone_depth.py b/tests/unit/test_clone_depth.py index 55102eac..933a18ff 100644 --- a/tests/unit/test_clone_depth.py +++ b/tests/unit/test_clone_depth.py @@ -6,6 +6,7 @@ container requires a specific repository and commit to be checked out, and that is the only thing that is tested. """ + import os import subprocess from tempfile import TemporaryDirectory diff --git a/tests/unit/test_connect_url.py b/tests/unit/test_connect_url.py index dbc0c260..dc72c181 100644 --- a/tests/unit/test_connect_url.py +++ b/tests/unit/test_connect_url.py @@ -1,6 +1,7 @@ """ Test if the explict hostname is supplied correctly to the container """ + import time import requests diff --git a/tests/unit/test_env.py b/tests/unit/test_env.py index fde4aed4..01dd5c72 100644 --- a/tests/unit/test_env.py +++ b/tests/unit/test_env.py @@ -1,6 +1,7 @@ """ Test that environment variables may be defined """ + import os import subprocess import sys diff --git a/tests/unit/test_external_scripts.py b/tests/unit/test_external_scripts.py index 278707c8..f33b326f 100644 --- a/tests/unit/test_external_scripts.py +++ b/tests/unit/test_external_scripts.py @@ -1,4 +1,5 @@ """Test if assemble scripts from outside of r2d repo are accepted.""" + import time from repo2docker.app import Repo2Docker diff --git a/tests/unit/test_labels.py b/tests/unit/test_labels.py index e6e1f2e9..c6d3a7e2 100644 --- a/tests/unit/test_labels.py +++ b/tests/unit/test_labels.py @@ -1,6 +1,7 @@ """ Test if labels are supplied correctly to the container """ + from unittest.mock import Mock import pytest diff --git a/tests/unit/test_subdir.py b/tests/unit/test_subdir.py index 4e700731..5a4e7a38 100644 --- a/tests/unit/test_subdir.py +++ b/tests/unit/test_subdir.py @@ -1,6 +1,7 @@ """ Test if the subdirectory is correctly navigated to """ + import os import escapism diff --git a/tests/unit/test_users.py b/tests/unit/test_users.py index 642e4f3b..89bee96f 100644 --- a/tests/unit/test_users.py +++ b/tests/unit/test_users.py @@ -1,6 +1,7 @@ """ Test that User name and ID mapping works """ + import os import subprocess import tempfile diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index c518bbd2..6ce9c254 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -1,6 +1,7 @@ """ Tests for repo2docker/utils.py """ + import os import platform import subprocess