From 3f0f1ed42b9971a87d0bf816fe3e9ed416fd7371 Mon Sep 17 00:00:00 2001 From: jakub-nt <175944085+jakub-nt@users.noreply.github.com> Date: Tue, 22 Oct 2024 20:04:38 +0200 Subject: [PATCH] Move the `masterfiles` module into the `cfbs` module Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com> --- cfbs/commands.py | 2 +- {masterfiles => cfbs/masterfiles}/__init__.py | 0 {masterfiles => cfbs/masterfiles}/analyze.py | 0 .../masterfiles}/check_download_matches_git.py | 0 .../masterfiles}/check_tarball_checksums.py | 0 .../masterfiles}/download_all_versions.py | 0 .../masterfiles}/generate_release_information.py | 10 +++++----- .../masterfiles}/generate_vcf_download.py | 2 +- .../masterfiles}/generate_vcf_git_checkout.py | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename {masterfiles => cfbs/masterfiles}/__init__.py (100%) rename {masterfiles => cfbs/masterfiles}/analyze.py (100%) rename {masterfiles => cfbs/masterfiles}/check_download_matches_git.py (100%) rename {masterfiles => cfbs/masterfiles}/check_tarball_checksums.py (100%) rename {masterfiles => cfbs/masterfiles}/download_all_versions.py (100%) rename {masterfiles => cfbs/masterfiles}/generate_release_information.py (74%) rename {masterfiles => cfbs/masterfiles}/generate_vcf_download.py (91%) rename {masterfiles => cfbs/masterfiles}/generate_vcf_git_checkout.py (96%) diff --git a/cfbs/commands.py b/cfbs/commands.py index b709a706..799766c2 100644 --- a/cfbs/commands.py +++ b/cfbs/commands.py @@ -65,7 +65,7 @@ from cfbs.git_magic import Result, commit_after_command, git_commit_maybe_prompt from cfbs.prompts import YES_NO_CHOICES, prompt_user from cfbs.module import Module, is_module_added_manually -from masterfiles.generate_release_information import generate_release_information +from cfbs.masterfiles.generate_release_information import generate_release_information class InputDataUpdateFailed(Exception): diff --git a/masterfiles/__init__.py b/cfbs/masterfiles/__init__.py similarity index 100% rename from masterfiles/__init__.py rename to cfbs/masterfiles/__init__.py diff --git a/masterfiles/analyze.py b/cfbs/masterfiles/analyze.py similarity index 100% rename from masterfiles/analyze.py rename to cfbs/masterfiles/analyze.py diff --git a/masterfiles/check_download_matches_git.py b/cfbs/masterfiles/check_download_matches_git.py similarity index 100% rename from masterfiles/check_download_matches_git.py rename to cfbs/masterfiles/check_download_matches_git.py diff --git a/masterfiles/check_tarball_checksums.py b/cfbs/masterfiles/check_tarball_checksums.py similarity index 100% rename from masterfiles/check_tarball_checksums.py rename to cfbs/masterfiles/check_tarball_checksums.py diff --git a/masterfiles/download_all_versions.py b/cfbs/masterfiles/download_all_versions.py similarity index 100% rename from masterfiles/download_all_versions.py rename to cfbs/masterfiles/download_all_versions.py diff --git a/masterfiles/generate_release_information.py b/cfbs/masterfiles/generate_release_information.py similarity index 74% rename from masterfiles/generate_release_information.py rename to cfbs/masterfiles/generate_release_information.py index cdfa4b4f..e2bf8c7d 100644 --- a/masterfiles/generate_release_information.py +++ b/cfbs/masterfiles/generate_release_information.py @@ -3,13 +3,13 @@ import sys from pathlib import Path -from masterfiles.download_all_versions import download_all_versions_enterprise -from masterfiles.check_tarball_checksums import check_tarball_checksums -from masterfiles.generate_vcf_download import generate_vcf_download -from masterfiles.generate_vcf_git_checkout import generate_vcf_git_checkout +from cfbs.masterfiles.download_all_versions import download_all_versions_enterprise +from cfbs.masterfiles.check_tarball_checksums import check_tarball_checksums +from cfbs.masterfiles.generate_vcf_download import generate_vcf_download +from cfbs.masterfiles.generate_vcf_git_checkout import generate_vcf_git_checkout # commented out for now as this adds an extra dependency in its current state (dictdiffer) -# from masterfiles.check_download_matches_git import check_download_matches_git +# from cfbs.masterfiles.check_download_matches_git import check_download_matches_git ENTERPRISE_PATH = Path("./enterprise") diff --git a/masterfiles/generate_vcf_download.py b/cfbs/masterfiles/generate_vcf_download.py similarity index 91% rename from masterfiles/generate_vcf_download.py rename to cfbs/masterfiles/generate_vcf_download.py index 1dd3aa0f..b84f7bf3 100644 --- a/masterfiles/generate_vcf_download.py +++ b/cfbs/masterfiles/generate_vcf_download.py @@ -1,5 +1,5 @@ from cfbs.utils import write_json -from masterfiles.analyze import initialize_vcf, versions_checksums_files +from cfbs.masterfiles.analyze import initialize_vcf, versions_checksums_files def generate_vcf_download(dir_path, downloaded_versions): diff --git a/masterfiles/generate_vcf_git_checkout.py b/cfbs/masterfiles/generate_vcf_git_checkout.py similarity index 96% rename from masterfiles/generate_vcf_git_checkout.py rename to cfbs/masterfiles/generate_vcf_git_checkout.py index 25f398c8..6553c8e8 100644 --- a/masterfiles/generate_vcf_git_checkout.py +++ b/cfbs/masterfiles/generate_vcf_git_checkout.py @@ -5,7 +5,7 @@ from cfbs.git import git_exists from cfbs.utils import write_json -from masterfiles.analyze import initialize_vcf, versions_checksums_files +from cfbs.masterfiles.analyze import initialize_vcf, versions_checksums_files DIR_PATH = "." """The path of the working directory."""