xmipp3-installer 2.0.3__tar.gz → 2.1.0__tar.gz

{xmipp3_installer-2.0.3/src/xmipp3_installer.egg-info → xmipp3_installer-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
-Name: xmipp3_installer
-Version: 2.0.3
+Name: xmipp3-installer
+Version: 2.1.0
 Summary: Package to handle the installation of Xmipp3
 Author-email: Martín Salinas <ssalinasmartin@gmail.com>
 License: GPL-3.0-only
@@ -22,9 +22,10 @@ License-File: LICENSE.txt
 Requires-Dist: typing-extensions>=4.12
 Requires-Dist: distro>=1.8.0
 Provides-Extra: test
-Requires-Dist: pytest==8.*; extra == "test"
+Requires-Dist: pytest==8.*; python_version < "3.10" and extra == "test"
+Requires-Dist: pytest==9.*; python_version >= "3.10" and extra == "test"
 Requires-Dist: pytest-cov==5.*; python_version < "3.9" and extra == "test"
-Requires-Dist: pytest-cov==6.*; python_version >= "3.9" and extra == "test"
+Requires-Dist: pytest-cov==7.*; python_version >= "3.9" and extra == "test"
 Requires-Dist: pytest-subprocess==1.*; extra == "test"
 Requires-Dist: pytest-localserver==0.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"
@@ -48,6 +49,13 @@ To run such help, once the package is installed, run:
 xmipp3_installer -h
 ```
 
+## Installation telemetry
+This installer collects **basic information about your installation environment** (such as library versions, system architecture, and operating system) to improve compatibility, performance, and stability.
+
+If you prefer **not to send this data**, you can disable data collection by simply setting the environment variable `XMIPP3_SEND_INSTALLATION_STATISTICS=OFF` before running the installation command.
+
+For more information, please visit [the documentation](https://i2pc.github.io/docs/Others/Enhancing/index.html#data-collection).
+
 ## Testing the code
 In order to run the tests for this project, the project needs to be installed in development mode and also the test dependencies need to be installed.
 

{xmipp3_installer-2.0.3 → xmipp3_installer-2.1.0}/README.md

@@ -14,6 +14,13 @@ To run such help, once the package is installed, run:
 xmipp3_installer -h
 ```
 
+## Installation telemetry
+This installer collects **basic information about your installation environment** (such as library versions, system architecture, and operating system) to improve compatibility, performance, and stability.
+
+If you prefer **not to send this data**, you can disable data collection by simply setting the environment variable `XMIPP3_SEND_INSTALLATION_STATISTICS=OFF` before running the installation command.
+
+For more information, please visit [the documentation](https://i2pc.github.io/docs/Others/Enhancing/index.html#data-collection).
+
 ## Testing the code
 In order to run the tests for this project, the project needs to be installed in development mode and also the test dependencies need to be installed.
 

{xmipp3_installer-2.0.3 → xmipp3_installer-2.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
-name = "xmipp3_installer"
-version = "2.0.3"
+name = "xmipp3-installer"
+version = "2.1.0"
 authors = [
   { name = "Martín Salinas", email = "ssalinasmartin@gmail.com" },
 ]
@@ -32,9 +32,10 @@ build-backend = "setuptools.build_meta"
 
 [project.optional-dependencies]
 test = [
-  "pytest==8.*",
+  "pytest==8.*; python_version < '3.10'",
+  "pytest==9.*; python_version >= '3.10'",
   "pytest-cov==5.*; python_version < '3.9'",
-  "pytest-cov==6.*; python_version >= '3.9'",
+  "pytest-cov==7.*; python_version >= '3.9'",
   "pytest-subprocess==1.*",
   "pytest-localserver==0.*",
   "ruff==0.*",
@@ -51,3 +52,5 @@ xmipp3_installer = "xmipp3_installer.__main__:main"
 
 
 
+
+

{xmipp3_installer-2.0.3 → xmipp3_installer-2.1.0}/src/xmipp3_installer/api_client/assembler/installation_info_assembler.py

@@ -65,7 +65,7 @@ def get_installation_info(version_manager: versions_manager.VersionsManager, ret
       "installedByScipion": environment_info[3]
     },
     "returnCode": ret_code,
-    "logTail": environment_info[4] if ret_code else None # Only needed if something went wrong
+    "logTail": __anonymize_log_tail(environment_info[4]) if ret_code else None # Only needed if something went wrong
   }
 
 def get_os_release_name() -> str:
@@ -136,6 +136,22 @@ def __get_log_tail() -> Optional[str]:
   )
   return output if ret_code == 0 else None
 
+def __anonymize_log_tail(log_text: Optional[str]) -> Optional[str]:
+  """
+  ### Anonymizes usernames in a log string.
+  
+  #### Args:
+  - log_text (str | None): Log text to anonymize.
+  
+  #### Returns:
+  - (str | None): Log text with occurrences of /home/<username> replaced by /home/REDACTED, or None if input was None.
+  """
+  if log_text is None:
+    return
+
+  pattern = re.compile(r'(/home/)([^/\s]+)')
+  return pattern.sub(r'\1REDACTED', log_text)
+
 def __get_mac_address() -> Optional[str]:
   """
   ### Returns a physical MAC address for this machine. It prioritizes ethernet over wireless.

{xmipp3_installer-2.0.3 → xmipp3_installer-2.1.0}/src/xmipp3_installer/installer/modes/mode_get_sources_executor.py

@@ -132,7 +132,7 @@ def _run_source_command(source_name: str, source_repo: str, target_branch: Optio
     )
   
   branch_str = (
-    f"{params.PARAMS[params.PARAM_BRANCH][params.LONG_VERSION]} {target_branch}"
+    f" {params.PARAMS[params.PARAM_BRANCH][params.LONG_VERSION]} {target_branch}"
     if target_branch else ""
   )
   return shell_handler.run_shell_command(f"git clone{branch_str} {source_repo}.git", cwd=paths.SOURCES_PATH)

{xmipp3_installer-2.0.3 → xmipp3_installer-2.1.0}/src/xmipp3_installer/repository/config.py

@@ -29,6 +29,7 @@ class ConfigurationFileHandler(Singleton):
     self.show_errors = show_errors
     self.values = {}
     self.read_config()
+    self.read_env_variables()
     self.last_modified = self.__read_config_date()
 
   def read_config(self):
@@ -50,6 +51,17 @@ class ConfigurationFileHandler(Singleton):
         show_warnings=self.show_errors
       )
     }
+  
+  def read_env_variables(self):
+    """### Reads the config variables present in the environment and updates the stored values with them."""
+    raw_variables = {
+      key[len(variables.ENVIRONMENT_VARIABLES_PREFIX):]: value
+      for key, value in os.environ.items()
+      if key.startswith(variables.ENVIRONMENT_VARIABLES_PREFIX)
+    }
+    self.values.update(
+      config_values_adapter.get_context_values_from_file_values(raw_variables)
+    )
 
   def write_config(self, overwrite: bool=False):
     """

{xmipp3_installer-2.0.3 → xmipp3_installer-2.1.0}/src/xmipp3_installer/repository/config_vars/variables.py

@@ -46,3 +46,6 @@ CONFIG_VARIABLES = {
 
 # Do not pass this variables to CMake, only for installer logic
 INTERNAL_LOGIC_VARS = [SEND_INSTALLATION_STATISTICS, CMAKE, BUILD_TYPE]
+
+# Prefix to be used when setting config variables in the environment
+ENVIRONMENT_VARIABLES_PREFIX = "XMIPP3_"

{xmipp3_installer-2.0.3 → xmipp3_installer-2.1.0/src/xmipp3_installer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
-Name: xmipp3_installer
-Version: 2.0.3
+Name: xmipp3-installer
+Version: 2.1.0
 Summary: Package to handle the installation of Xmipp3
 Author-email: Martín Salinas <ssalinasmartin@gmail.com>
 License: GPL-3.0-only
@@ -22,9 +22,10 @@ License-File: LICENSE.txt
 Requires-Dist: typing-extensions>=4.12
 Requires-Dist: distro>=1.8.0
 Provides-Extra: test
-Requires-Dist: pytest==8.*; extra == "test"
+Requires-Dist: pytest==8.*; python_version < "3.10" and extra == "test"
+Requires-Dist: pytest==9.*; python_version >= "3.10" and extra == "test"
 Requires-Dist: pytest-cov==5.*; python_version < "3.9" and extra == "test"
-Requires-Dist: pytest-cov==6.*; python_version >= "3.9" and extra == "test"
+Requires-Dist: pytest-cov==7.*; python_version >= "3.9" and extra == "test"
 Requires-Dist: pytest-subprocess==1.*; extra == "test"
 Requires-Dist: pytest-localserver==0.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"
@@ -48,6 +49,13 @@ To run such help, once the package is installed, run:
 xmipp3_installer -h
 ```
 
+## Installation telemetry
+This installer collects **basic information about your installation environment** (such as library versions, system architecture, and operating system) to improve compatibility, performance, and stability.
+
+If you prefer **not to send this data**, you can disable data collection by simply setting the environment variable `XMIPP3_SEND_INSTALLATION_STATISTICS=OFF` before running the installation command.
+
+For more information, please visit [the documentation](https://i2pc.github.io/docs/Others/Enhancing/index.html#data-collection).
+
 ## Testing the code
 In order to run the tests for this project, the project needs to be installed in development mode and also the test dependencies need to be installed.
 

{xmipp3_installer-2.0.3 → xmipp3_installer-2.1.0}/src/xmipp3_installer.egg-info/requires.txt

@@ -2,15 +2,20 @@ typing-extensions>=4.12
 distro>=1.8.0
 
 [test]
-pytest==8.*
 pytest-subprocess==1.*
 pytest-localserver==0.*
 ruff==0.*
 cmake==4.*
 ninja==1.*
 
+[test:python_version < "3.10"]
+pytest==8.*
+
 [test:python_version < "3.9"]
 pytest-cov==5.*
 
+[test:python_version >= "3.10"]
+pytest==9.*
+
 [test:python_version >= "3.9"]
-pytest-cov==6.*
+pytest-cov==7.*