Move the masterfiles module into the cfbs module

Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>
cfengine · Oct 22, 2024 · 3f0f1ed · 3f0f1ed
1 parent 2768a80
commit 3f0f1ed
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git 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 → cfbs/masterfiles/__init__.py b/masterfiles/__init__.py → cfbs/masterfiles/__init__.py
diff --git a/masterfiles/analyze.py → cfbs/masterfiles/analyze.py b/masterfiles/analyze.py → cfbs/masterfiles/analyze.py
diff --git a/masterfiles/check_download_matches_git.py → ...masterfiles/check_download_matches_git.py b/masterfiles/check_download_matches_git.py → ...masterfiles/check_download_matches_git.py
diff --git a/masterfiles/check_tarball_checksums.py → cfbs/masterfiles/check_tarball_checksums.py b/masterfiles/check_tarball_checksums.py → cfbs/masterfiles/check_tarball_checksums.py
diff --git a/masterfiles/download_all_versions.py → cfbs/masterfiles/download_all_versions.py b/masterfiles/download_all_versions.py → cfbs/masterfiles/download_all_versions.py
diff --git a/masterfiles/generate_release_information.py → ...sterfiles/generate_release_information.py b/masterfiles/generate_release_information.py → ...sterfiles/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 → cfbs/masterfiles/generate_vcf_download.py b/masterfiles/generate_vcf_download.py → 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 → .../masterfiles/generate_vcf_git_checkout.py b/masterfiles/generate_vcf_git_checkout.py → .../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."""