atomicshop 2.11.28__py3-none-any.whl → 2.11.30__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.11.28'
+__version__ = '2.11.30'

atomicshop/wrappers/factw/config_install.py

@@ -6,6 +6,8 @@ SRC_DIRECTORY_PATH: str = 'src'
 
 # Before restart.
 PRE_INSTALL_FILE_PATH: str = SRC_DIRECTORY_PATH + os.sep + 'install' + os.sep + 'pre_install.sh'
+PRE_INSTALL_PREREQUISITES_FILE_PATH: str = (
+        SRC_DIRECTORY_PATH + os.sep + 'install' + os.sep + 'requirements_pre_install.txt')
 
 # After restart.
 INSTALL_LOG_FILE_NAME: str = 'install.log'

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -1,12 +1,10 @@
 import subprocess
 from pathlib import Path
-import sys
 
 from .... import permissions, filesystem
 from ....archiver import zips
 from ....print_api import print_api
-from ... import githubw
-from ...dockerw import install_docker
+from ... import githubw, pipw, ubuntu_terminal
 from .. import config_install
 
 
@@ -14,6 +12,7 @@ def install_before_restart(
         installation_directory: str,
         remove_existing_installation_directory: bool = True,
         fact_source_archive_path: str = None,
+        use_built_in_fact_installer: bool = True,
         print_kwargs: dict = None
 ):
     """
@@ -29,6 +28,9 @@ def install_before_restart(
         This is optional, if not provided, the latest version of the FACT_core will be downloaded.
         The archive should be an exact copy of the FACT_core repository of the master branch as you download it from
         GitHub.
+    :param use_built_in_fact_installer: bool, if True, the built-in FACT_core installer will be used.
+        If False, only the regular prerequisites will be installed, while the user will need to install DOCKER
+        and Node.js separately.
     :param print_kwargs: dict, the print kwargs for the print_api function.
     :return:
     """
@@ -43,41 +45,52 @@ def install_before_restart(
     #         use_docker_installer=True, rootless=True, add_current_user_to_docker_group_bool=False)
 
     # docker_keyring_file_path: str = "/etc/apt/keyrings/docker.gpg"
-    nodesource_keyring_file_path: str = "/etc/apt/keyrings/nodesource.gpg"
+    # nodesource_keyring_file_path: str = "/etc/apt/keyrings/nodesource.gpg"
     fact_core_pre_install_file_path = str(Path(installation_directory, config_install.PRE_INSTALL_FILE_PATH))
 
     # Remove the existing keyrings, so we will not be asked to overwrite it if it exists.
     # filesystem.remove_file(docker_keyring_file_path)
-    filesystem.remove_file(nodesource_keyring_file_path)
+    # filesystem.remove_file(nodesource_keyring_file_path)
 
     # Remove the existing installation directory.
     if remove_existing_installation_directory:
         filesystem.remove_directory(installation_directory)
 
     # Since you run the script with sudo, we need to change the permissions to the current user.
-    with permissions.temporary_regular_permissions():
-        # Create the FACT_core directory.
-        filesystem.create_directory(installation_directory)
+    # with permissions.temporary_regular_permissions():
+    # Create the FACT_core directory.
+    filesystem.create_directory(installation_directory)
+
+    if not fact_source_archive_path:
+        # Download the FACT_core repo.
+        if not filesystem.get_file_paths_from_directory(installation_directory):
+            git_wrapper = githubw.GitHubWrapper(repo_url=config_install.FACT_CORE_GITHUB_URL)
+            git_wrapper.build_links_from_repo_url()
+            git_wrapper.download_and_extract_branch(
+                target_directory=installation_directory,
+                archive_remove_first_directory=True)
+    else:
+        # Extract the archive and remove the first directory.
+        zips.extract_archive_with_zipfile(
+            archive_path=fact_source_archive_path, extract_directory=installation_directory,
+            remove_first_directory=True, **(print_kwargs or {}))
 
-        if not fact_source_archive_path:
-            # Download the FACT_core repo.
-            if not filesystem.get_file_paths_from_directory(installation_directory):
-                git_wrapper = githubw.GitHubWrapper(repo_url=config_install.FACT_CORE_GITHUB_URL)
-                git_wrapper.build_links_from_repo_url()
-                git_wrapper.download_and_extract_branch(
-                    target_directory=installation_directory,
-                    archive_remove_first_directory=True)
-        else:
-            # Extract the archive and remove the first directory.
-            zips.extract_archive_with_zipfile(
-                archive_path=fact_source_archive_path, extract_directory=installation_directory,
-                remove_first_directory=True, **(print_kwargs or {}))
+    # Set the executable permission on the pre-installation file.
+    permissions.set_executable_permission(fact_core_pre_install_file_path)
 
-        # Set the executable permission on the pre-installation file.
-        permissions.set_executable_permission(fact_core_pre_install_file_path)
+    if use_built_in_fact_installer:
+        # Run the shell script
+        subprocess.run(['bash', fact_core_pre_install_file_path])
+    else:
+        message = ("You will need to install DOCKER and NODEJS separately.\n"
+                   "This was done to enable Rootless docker install and install other version of NodeJS.")
+        print_api(message, color='yellow')
 
-    # Run the shell script
-    subprocess.run(['bash', fact_core_pre_install_file_path])
+        ubuntu_terminal.update_system_packages()
+        ubuntu_terminal.install_packages(['python3-pip', 'git', 'libffi-dev', 'lsb-release'])
+        pipw.install_packages_with_current_interpreter(
+            prefer_binary=True,
+            requirements_file_path=config_install.PRE_INSTALL_PREREQUISITES_FILE_PATH)
 
     # Install docker. FACT installs the docker, but there can be a problem with permissions, so we need to add
     # the user permissions to the docker group before restart.

atomicshop/wrappers/pipw.py

@@ -3,15 +3,19 @@ import sys
 
 
 def install_packages_with_current_interpreter(
-        package_name_list: list[str],
+        package_name_list: list[str] = None,
         user: bool = False,
-        upgrade: bool = False
+        upgrade: bool = False,
+        prefer_binary: bool = False,
+        requirements_file_path: str = None
 ):
     """
     This function will install the packages with the current interpreter.
     :param package_name_list: list, the list of package names to install.
     :param user: bool, if True, the packages will be installed for the current user.
     :param upgrade: bool, if True, the packages will be upgraded.
+    :param prefer_binary: bool, if True, the binary packages will be preferred.
+    :param requirements_file_path: string, the path to the requirements file.
     :return:
     """
 
@@ -21,6 +25,14 @@ def install_packages_with_current_interpreter(
         commands.append("--user")
     if upgrade:
         commands.append("--upgrade")
+    if prefer_binary:
+        commands.append("--prefer-binary")
+    if requirements_file_path:
+        commands.append("-r")
+        commands.append(requirements_file_path)
 
-    for package_name in package_name_list:
-        subprocess.check_call([*commands, package_name])
+    if package_name_list:
+        for package_name in package_name_list:
+            subprocess.check_call([*commands, package_name])
+    else:
+        subprocess.check_call(commands)

{atomicshop-2.11.28.dist-info → atomicshop-2.11.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.11.28
+Version: 2.11.30
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.11.28.dist-info → atomicshop-2.11.30.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=6f3QGzoUPy-Ig8Md0QTeVuLBdtsArggZ3OXJsOfGxxI,124
+atomicshop/__init__.py,sha256=0yKixDn2ebzNbUhatDcnc-bep-dodkvVk_4xKZbeF_8,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -149,7 +149,7 @@ atomicshop/wrappers/ffmpegw.py,sha256=wcq0ZnAe0yajBOuTKZCCaKI7CDBjkq7FAgdW5IsKcV
 atomicshop/wrappers/githubw.py,sha256=mQGtj6up1HIvjOD2t0bmOWjLooJLYvuIa7d7H-tknrw,9998
 atomicshop/wrappers/numpyw.py,sha256=sBV4gSKyr23kXTalqAb1oqttzE_2XxBooCui66jbAqc,1025
 atomicshop/wrappers/olefilew.py,sha256=biD5m58rogifCYmYhJBrAFb9O_Bn_spLek_9HofLeYE,2051
-atomicshop/wrappers/pipw.py,sha256=iq4pDhmrHqKbcRi3Y6_v2PQSdb4fqfAx79rsX7JEmXo,801
+atomicshop/wrappers/pipw.py,sha256=mu4jnHkSaYNfpBiLZKMZxEX_E2LqW5BVthMZkblPB_c,1317
 atomicshop/wrappers/process_wrapper_pbtk.py,sha256=ycPmBRnv627RWks6N8OhxJQe8Gu3h3Vwj-4HswPOw0k,599
 atomicshop/wrappers/pyopensslw.py,sha256=OBWxA6EJ2vU_Qlf4M8m6ilcG3hyYB4yB0EsXUf7NhEU,6804
 atomicshop/wrappers/ubuntu_terminal.py,sha256=Kodf7FLBplqfLR86YaXb-JlkRVORPgLVS5P6aHkx-Vg,9541
@@ -181,14 +181,14 @@ atomicshop/wrappers/elasticsearchw/queries/size.py,sha256=ZThvspfxpXRBI6Mht9kkb5
 atomicshop/wrappers/elasticsearchw/queries/sort.py,sha256=-CUhgcs_AVRvncRlLTl5IJZE8K3RgDNLYSIHnn0j7aE,1274
 atomicshop/wrappers/factw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/factw/config_fact.py,sha256=J-K9Zn50WcDC7ubb-boraSZExfBk7a6M52NhRJVlsjk,895
-atomicshop/wrappers/factw/config_install.py,sha256=QRygFnZ5r1ybJQl7ftFci3kNRmU-a-w3lMG1joElvcY,417
+atomicshop/wrappers/factw/config_install.py,sha256=N-6Fg4Z_aG33r0WGlYgBQTFnamJceYyW4XjnGyyNAks,555
 atomicshop/wrappers/factw/get_file_data.py,sha256=ChKC0OjgjFlNubZQBwcGhRO3L2pccc27RLRlAMIUix4,1641
 atomicshop/wrappers/factw/fact_extractor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=jJAoJNQ4aoATjn3x_va031Obb4oBtcqCY40hydghm0s,2504
 atomicshop/wrappers/factw/fact_extractor/get_extractor.py,sha256=2mfOAftHIlCcGt1s7MWdq7DsDCuI6wX3MtvcEZ4SK-0,756
 atomicshop/wrappers/factw/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/factw/install/install_after_restart.py,sha256=-VXC3KDX2BzF0oi0ELCmfch55vLk-3t16KxlmYyUGD8,1560
-atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=zM2255NB5H4drXlbkIy2r87JkgsJ04BlOoImafwjimU,4519
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=YhFqqwS_jtgksg7U-4SzegMZayrblxVdsavm7Myx3r4,5340
 atomicshop/wrappers/factw/postgresql/__init__.py,sha256=xMBn2d3Exo23IPP2F_9-SXmOlhFbwWDgS9KwozSTjA0,162
 atomicshop/wrappers/factw/postgresql/analysis.py,sha256=2Rxzy2jyq3zEKIo53z8VkjuslKE_i5mq2ZpmJAvyd6U,716
 atomicshop/wrappers/factw/postgresql/file_object.py,sha256=VRiCXnsd6yDbnsE-TEKYPC-gkAgFVkE6rygRrJLQShI,713
@@ -243,8 +243,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.11.28.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.11.28.dist-info/METADATA,sha256=sBBYP7_MHuNOGgSjvNxHMU45ikwo26uNxozs-uWaBdQ,10448
-atomicshop-2.11.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.11.28.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.11.28.dist-info/RECORD,,
+atomicshop-2.11.30.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.11.30.dist-info/METADATA,sha256=tkLSN2TVqMjpjvq0hp2JNJSkdSetzDxkF7wK4eeMoe0,10448
+atomicshop-2.11.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.11.30.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.11.30.dist-info/RECORD,,