xmipp3-installer 2.0.2__tar.gz → 2.0.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {xmipp3_installer-2.0.2/src/xmipp3_installer.egg-info → xmipp3_installer-2.0.4}/PKG-INFO +6 -5
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/pyproject.toml +10 -5
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/api_client/assembler/installation_info_assembler.py +17 -1
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4/src/xmipp3_installer.egg-info}/PKG-INFO +6 -5
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/requires.txt +8 -3
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/LICENSE.txt +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/README.md +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/setup.cfg +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/__main__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/api_client/api_client.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/arguments/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/arguments/modes.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/arguments/params.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/cli.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/parsers/base_help_formatter.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/parsers/error_handler_parser.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/parsers/format.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/parsers/general_help_formatter.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/parsers/mode_help_formatter.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/logger/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/logger/errors.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/logger/logger.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/logger/predefined_messages.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/user_interactions.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/constants/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/constants/paths.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/cmake/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/cmake/cmake_constants.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/cmake/cmake_handler.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/conda_handler.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/generic_package_handler.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/git_handler.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/shell_handler.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/handlers/versions_manager.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/installer_service.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_all_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_clean/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_clean/mode_clean_all_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_clean/mode_clean_bin_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_clean/mode_clean_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_cmake/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_cmake/mode_cmake_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_cmake/mode_compile_and_install_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_cmake/mode_config_build_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_config_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_get_sources_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_git_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_selector.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_sync/mode_add_model_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_sync/mode_get_models_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_sync/mode_sync_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_sync/mode_test_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/mode_version_executor.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/orquestrator.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/urls.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/repository/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/repository/config.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/repository/config_vars/__init__.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/repository/config_vars/config_values_adapter.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/repository/config_vars/default_values.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/repository/config_vars/variables.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/repository/invalid_config_line.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/shared/file_operations.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/shared/singleton.py +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/SOURCES.txt +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/dependency_links.txt +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/entry_points.txt +0 -0
- {xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
|
-
Name:
|
|
3
|
-
Version: 2.0.
|
|
2
|
+
Name: xmipp3-installer
|
|
3
|
+
Version: 2.0.4
|
|
4
4
|
Summary: Package to handle the installation of Xmipp3
|
|
5
5
|
Author-email: Martín Salinas <ssalinasmartin@gmail.com>
|
|
6
6
|
License: GPL-3.0-only
|
|
@@ -20,11 +20,12 @@ Requires-Python: >=3.8
|
|
|
20
20
|
Description-Content-Type: text/markdown
|
|
21
21
|
License-File: LICENSE.txt
|
|
22
22
|
Requires-Dist: typing-extensions>=4.12
|
|
23
|
-
Requires-Dist: distro>=1.
|
|
23
|
+
Requires-Dist: distro>=1.8.0
|
|
24
24
|
Provides-Extra: test
|
|
25
|
-
Requires-Dist: pytest==8.*; extra == "test"
|
|
25
|
+
Requires-Dist: pytest==8.*; python_version < "3.10" and extra == "test"
|
|
26
|
+
Requires-Dist: pytest==9.*; python_version >= "3.10" and extra == "test"
|
|
26
27
|
Requires-Dist: pytest-cov==5.*; python_version < "3.9" and extra == "test"
|
|
27
|
-
Requires-Dist: pytest-cov==
|
|
28
|
+
Requires-Dist: pytest-cov==7.*; python_version >= "3.9" and extra == "test"
|
|
28
29
|
Requires-Dist: pytest-subprocess==1.*; extra == "test"
|
|
29
30
|
Requires-Dist: pytest-localserver==0.*; extra == "test"
|
|
30
31
|
Requires-Dist: ruff==0.*; extra == "test"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
|
-
name = "
|
|
3
|
-
version = "2.0.
|
|
2
|
+
name = "xmipp3-installer"
|
|
3
|
+
version = "2.0.4"
|
|
4
4
|
authors = [
|
|
5
5
|
{ name = "Martín Salinas", email = "ssalinasmartin@gmail.com" },
|
|
6
6
|
]
|
|
@@ -23,7 +23,7 @@ license = { text = "GPL-3.0-only" }
|
|
|
23
23
|
requires-python = ">=3.8"
|
|
24
24
|
dependencies = [
|
|
25
25
|
"typing-extensions>=4.12",
|
|
26
|
-
"distro>=1.
|
|
26
|
+
"distro>=1.8.0"
|
|
27
27
|
]
|
|
28
28
|
|
|
29
29
|
[build-system]
|
|
@@ -32,9 +32,10 @@ build-backend = "setuptools.build_meta"
|
|
|
32
32
|
|
|
33
33
|
[project.optional-dependencies]
|
|
34
34
|
test = [
|
|
35
|
-
"pytest==8
|
|
35
|
+
"pytest==8.*; python_version < '3.10'",
|
|
36
|
+
"pytest==9.*; python_version >= '3.10'",
|
|
36
37
|
"pytest-cov==5.*; python_version < '3.9'",
|
|
37
|
-
"pytest-cov==
|
|
38
|
+
"pytest-cov==7.*; python_version >= '3.9'",
|
|
38
39
|
"pytest-subprocess==1.*",
|
|
39
40
|
"pytest-localserver==0.*",
|
|
40
41
|
"ruff==0.*",
|
|
@@ -49,3 +50,7 @@ Issues = "https://github.com/I2PC/xmipp3-installer/issues"
|
|
|
49
50
|
[project.scripts]
|
|
50
51
|
xmipp3_installer = "xmipp3_installer.__main__:main"
|
|
51
52
|
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
|
|
@@ -65,7 +65,7 @@ def get_installation_info(version_manager: versions_manager.VersionsManager, ret
|
|
|
65
65
|
"installedByScipion": environment_info[3]
|
|
66
66
|
},
|
|
67
67
|
"returnCode": ret_code,
|
|
68
|
-
"logTail": environment_info[4] if ret_code else None # Only needed if something went wrong
|
|
68
|
+
"logTail": __anonymize_log_tail(environment_info[4]) if ret_code else None # Only needed if something went wrong
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
def get_os_release_name() -> str:
|
|
@@ -136,6 +136,22 @@ def __get_log_tail() -> Optional[str]:
|
|
|
136
136
|
)
|
|
137
137
|
return output if ret_code == 0 else None
|
|
138
138
|
|
|
139
|
+
def __anonymize_log_tail(log_text: Optional[str]) -> Optional[str]:
|
|
140
|
+
"""
|
|
141
|
+
### Anonymizes usernames in a log string.
|
|
142
|
+
|
|
143
|
+
#### Args:
|
|
144
|
+
- log_text (str | None): Log text to anonymize.
|
|
145
|
+
|
|
146
|
+
#### Returns:
|
|
147
|
+
- (str | None): Log text with occurrences of /home/<username> replaced by /home/REDACTED, or None if input was None.
|
|
148
|
+
"""
|
|
149
|
+
if log_text is None:
|
|
150
|
+
return
|
|
151
|
+
|
|
152
|
+
pattern = re.compile(r'(/home/)([^/\s]+)')
|
|
153
|
+
return pattern.sub(r'\1REDACTED', log_text)
|
|
154
|
+
|
|
139
155
|
def __get_mac_address() -> Optional[str]:
|
|
140
156
|
"""
|
|
141
157
|
### Returns a physical MAC address for this machine. It prioritizes ethernet over wireless.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
|
-
Name:
|
|
3
|
-
Version: 2.0.
|
|
2
|
+
Name: xmipp3-installer
|
|
3
|
+
Version: 2.0.4
|
|
4
4
|
Summary: Package to handle the installation of Xmipp3
|
|
5
5
|
Author-email: Martín Salinas <ssalinasmartin@gmail.com>
|
|
6
6
|
License: GPL-3.0-only
|
|
@@ -20,11 +20,12 @@ Requires-Python: >=3.8
|
|
|
20
20
|
Description-Content-Type: text/markdown
|
|
21
21
|
License-File: LICENSE.txt
|
|
22
22
|
Requires-Dist: typing-extensions>=4.12
|
|
23
|
-
Requires-Dist: distro>=1.
|
|
23
|
+
Requires-Dist: distro>=1.8.0
|
|
24
24
|
Provides-Extra: test
|
|
25
|
-
Requires-Dist: pytest==8.*; extra == "test"
|
|
25
|
+
Requires-Dist: pytest==8.*; python_version < "3.10" and extra == "test"
|
|
26
|
+
Requires-Dist: pytest==9.*; python_version >= "3.10" and extra == "test"
|
|
26
27
|
Requires-Dist: pytest-cov==5.*; python_version < "3.9" and extra == "test"
|
|
27
|
-
Requires-Dist: pytest-cov==
|
|
28
|
+
Requires-Dist: pytest-cov==7.*; python_version >= "3.9" and extra == "test"
|
|
28
29
|
Requires-Dist: pytest-subprocess==1.*; extra == "test"
|
|
29
30
|
Requires-Dist: pytest-localserver==0.*; extra == "test"
|
|
30
31
|
Requires-Dist: ruff==0.*; extra == "test"
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/requires.txt
RENAMED
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
typing-extensions>=4.12
|
|
2
|
-
distro>=1.
|
|
2
|
+
distro>=1.8.0
|
|
3
3
|
|
|
4
4
|
[test]
|
|
5
|
-
pytest==8.*
|
|
6
5
|
pytest-subprocess==1.*
|
|
7
6
|
pytest-localserver==0.*
|
|
8
7
|
ruff==0.*
|
|
9
8
|
cmake==4.*
|
|
10
9
|
ninja==1.*
|
|
11
10
|
|
|
11
|
+
[test:python_version < "3.10"]
|
|
12
|
+
pytest==8.*
|
|
13
|
+
|
|
12
14
|
[test:python_version < "3.9"]
|
|
13
15
|
pytest-cov==5.*
|
|
14
16
|
|
|
17
|
+
[test:python_version >= "3.10"]
|
|
18
|
+
pytest==9.*
|
|
19
|
+
|
|
15
20
|
[test:python_version >= "3.9"]
|
|
16
|
-
pytest-cov==
|
|
21
|
+
pytest-cov==7.*
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/api_client/api_client.py
RENAMED
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/__init__.py
RENAMED
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/cli/cli.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/logger/errors.py
RENAMED
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/application/logger/logger.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/constants/paths.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/modes/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/installer/orquestrator.py
RENAMED
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/repository/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer/shared/file_operations.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/entry_points.txt
RENAMED
|
File without changes
|
{xmipp3_installer-2.0.2 → xmipp3_installer-2.0.4}/src/xmipp3_installer.egg-info/top_level.txt
RENAMED
|
File without changes
|