diff --git a/tagging/git_helper.py b/tagging/git_helper.py index 7318f90e..d5c0c09a 100755 --- a/tagging/git_helper.py +++ b/tagging/git_helper.py @@ -1,7 +1,9 @@ #!/usr/bin/env python3 # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -from plumbum.cmd import git +import plumbum + +git = plumbum.local["git"] class GitHelper: diff --git a/tagging/manifests.py b/tagging/manifests.py index e7a51924..d53c8c42 100644 --- a/tagging/manifests.py +++ b/tagging/manifests.py @@ -1,11 +1,13 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. +import plumbum from docker.models.containers import Container -from plumbum.cmd import docker from .docker_runner import DockerRunner from .git_helper import GitHelper +docker = plumbum.local["docker"] + def quoted_output(container: Container, cmd: str) -> str: return "\n".join( diff --git a/tagging/tag_image.py b/tagging/tag_image.py index c1783f52..4b020a74 100755 --- a/tagging/tag_image.py +++ b/tagging/tag_image.py @@ -4,12 +4,14 @@ import argparse import logging -from plumbum.cmd import docker +import plumbum from .docker_runner import DockerRunner from .get_taggers_and_manifests import get_taggers_and_manifests from .github_set_env import github_set_env +docker = plumbum.local["docker"] + LOGGER = logging.getLogger(__name__) diff --git a/tests/run_tests.py b/tests/run_tests.py index a30a0391..f4594931 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -6,7 +6,8 @@ import logging import plumbum from images_hierarchy import get_test_dirs -from plumbum.cmd import pytest + +pytest = plumbum.local["pytest"] LOGGER = logging.getLogger(__name__)