diff --git a/Makefile b/Makefile index 6c2b6c7a..00eabfee 100644 --- a/Makefile +++ b/Makefile @@ -100,8 +100,8 @@ git-commit: ## commit outstading git changes and push to remote hook/%: WIKI_PATH?=../wiki hook/%: ## run post-build hooks for an image - ./tagging/tag_image.py --short-image-name "$(notdir $@)" --owner "$(OWNER)" && \ - ./tagging/create_manifests.py --short-image-name "$(notdir $@)" --owner "$(OWNER)" --wiki-path "$(WIKI_PATH)" + python3 -m tagging.tag_image --short-image-name "$(notdir $@)" --owner "$(OWNER)" && \ + python3 -m tagging.create_manifests --short-image-name "$(notdir $@)" --owner "$(OWNER)" --wiki-path "$(WIKI_PATH)" hook-all: $(foreach I,$(ALL_IMAGES),hook/$(I) ) ## run post-build hooks for all images diff --git a/tagging/__init__.py b/tagging/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tagging/create_manifests.py b/tagging/create_manifests.py index e5aa8267..9963b20a 100755 --- a/tagging/create_manifests.py +++ b/tagging/create_manifests.py @@ -5,10 +5,10 @@ import argparse import datetime import logging import os -from docker_runner import DockerRunner -from get_taggers_and_manifests import get_taggers_and_manifests -from git_helper import GitHelper -from manifests import ManifestHeader +from .docker_runner import DockerRunner +from .get_taggers_and_manifests import get_taggers_and_manifests +from .git_helper import GitHelper +from .manifests import ManifestHeader logger = logging.getLogger(__name__) diff --git a/tagging/get_taggers_and_manifests.py b/tagging/get_taggers_and_manifests.py index 2867601b..02eeb516 100644 --- a/tagging/get_taggers_and_manifests.py +++ b/tagging/get_taggers_and_manifests.py @@ -1,6 +1,6 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -from images_hierarchy import ALL_IMAGES +from .images_hierarchy import ALL_IMAGES def get_taggers_and_manifests(short_image_name): diff --git a/tagging/images_hierarchy.py b/tagging/images_hierarchy.py index 658b369a..21c39b8e 100644 --- a/tagging/images_hierarchy.py +++ b/tagging/images_hierarchy.py @@ -2,13 +2,13 @@ # Distributed under the terms of the Modified BSD License. from dataclasses import dataclass, field from typing import Optional, List -from taggers import TaggerInterface, \ +from .taggers import TaggerInterface, \ SHATagger, \ UbuntuVersionTagger, PythonVersionTagger, \ JupyterNotebookVersionTagger, JupyterLabVersionTagger, JupyterHubVersionTagger, \ RVersionTagger, TensorflowVersionTagger, JuliaVersionTagger, \ SparkVersionTagger, HadoopVersionTagger, JavaVersionTagger -from manifests import ManifestInterface, \ +from .manifests import ManifestInterface, \ CondaEnvironmentManifest, AptPackagesManifest, \ RPackagesManifest, JuliaPackagesManifest, SparkInfoManifest diff --git a/tagging/manifests.py b/tagging/manifests.py index 60258f46..f1c584f3 100644 --- a/tagging/manifests.py +++ b/tagging/manifests.py @@ -2,8 +2,8 @@ # Distributed under the terms of the Modified BSD License. import logging from plumbum.cmd import docker -from docker_runner import run_simple_command -from git_helper import GitHelper +from .docker_runner import run_simple_command +from .git_helper import GitHelper logger = logging.getLogger(__name__) diff --git a/tagging/tag_image.py b/tagging/tag_image.py index abbc27eb..0726deac 100755 --- a/tagging/tag_image.py +++ b/tagging/tag_image.py @@ -4,8 +4,8 @@ import argparse import logging from plumbum.cmd import docker -from docker_runner import DockerRunner -from get_taggers_and_manifests import get_taggers_and_manifests +from .docker_runner import DockerRunner +from .get_taggers_and_manifests import get_taggers_and_manifests logger = logging.getLogger(__name__) diff --git a/tagging/taggers.py b/tagging/taggers.py index 928ba58b..a702c4a3 100644 --- a/tagging/taggers.py +++ b/tagging/taggers.py @@ -1,8 +1,8 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. import logging -from git_helper import GitHelper -from docker_runner import run_simple_command +from .git_helper import GitHelper +from .docker_runner import run_simple_command logger = logging.getLogger(__name__)