Skip to content

Commit 658aca7

Browse files
committed
Alléger la config ARK et l'affichage de l'éditeur
1 parent 4fd1de0 commit 658aca7

3 files changed

Lines changed: 7 additions & 50 deletions

File tree

Core/AdvancedConfigEditor.py

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -381,38 +381,6 @@ def validate_payload(file_id: str, data: Any) -> tuple[list[str], list[str]]:
381381
):
382382
errs.append("build.exclude must be a list of strings.")
383383

384-
deps = data.get("dependencies")
385-
if deps is not None and not isinstance(deps, dict):
386-
errs.append("dependencies must be an object.")
387-
if isinstance(deps, dict):
388-
req_files = deps.get("requirements_files")
389-
if req_files is not None and (
390-
not isinstance(req_files, list)
391-
or not all(isinstance(item, str) for item in req_files)
392-
):
393-
errs.append(
394-
"dependencies.requirements_files must be a list of strings."
395-
)
396-
autogen = deps.get("auto_generate_from_imports")
397-
if autogen is not None and not isinstance(autogen, bool):
398-
errs.append(
399-
"dependencies.auto_generate_from_imports must be a boolean."
400-
)
401-
402-
env = data.get("environment_manager")
403-
if env is not None and not isinstance(env, dict):
404-
errs.append("environment_manager must be an object.")
405-
if isinstance(env, dict):
406-
priority = env.get("priority")
407-
if priority is not None and (
408-
not isinstance(priority, list)
409-
or not all(isinstance(item, str) for item in priority)
410-
):
411-
errs.append("environment_manager.priority must be a list of strings.")
412-
for flag in ("auto_detect", "fallback_to_pip"):
413-
if flag in env and not isinstance(env.get(flag), bool):
414-
errs.append(f"environment_manager.{flag} must be a boolean.")
415-
416384
elif file_id == "bcasl":
417385
file_patterns = data.get("file_patterns")
418386
if file_patterns is not None and (

Core/Configs/__init__.py

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@
133133

134134
DEFAULT_CONFIG: dict[str, Any] = {
135135
**deepcopy(DEFAULT_ARK_CONFIG),
136-
"dependencies": deepcopy(DEFAULT_DEPENDENCY_OPTIONS),
137-
"environment_manager": deepcopy(DEFAULT_ENVIRONMENT_MANAGER_OPTIONS),
138136
"build": {
139137
**deepcopy(DEFAULT_ARK_CONFIG["build"]),
140138
"entrypoint": None,
@@ -211,22 +209,6 @@ def _looks_like_semver(value: str) -> bool:
211209
def _compatibility_view(config: dict[str, Any]) -> dict[str, Any]:
212210
normalized = normalize_ark_config(config)
213211
view = deepcopy(normalized)
214-
view["dependencies"] = _deep_merge_dict(
215-
DEFAULT_DEPENDENCY_OPTIONS,
216-
(
217-
config.get("dependencies")
218-
if isinstance(config.get("dependencies"), dict)
219-
else {}
220-
),
221-
)
222-
view["environment_manager"] = _deep_merge_dict(
223-
DEFAULT_ENVIRONMENT_MANAGER_OPTIONS,
224-
(
225-
config.get("environment_manager")
226-
if isinstance(config.get("environment_manager"), dict)
227-
else {}
228-
),
229-
)
230212
build = view.get("build")
231213
if not isinstance(build, dict):
232214
build = {}
@@ -255,6 +237,8 @@ def normalize_ark_config(config: dict[str, Any]) -> dict[str, Any]:
255237
# Nettoyage explicite des clés obsolètes si présentes
256238
merged.pop("exclusion_patterns", None)
257239
merged.pop("inclusion_patterns", None)
240+
merged.pop("dependencies", None)
241+
merged.pop("environment_manager", None)
258242

259243
# Normalisation de la section 'project'
260244
project = merged.get("project")

Ui/Gui/Dialogs/AdvancedConfigEditor.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,12 @@ def _update_outline(self, state: dict[str, Any]) -> None:
318318
return
319319

320320
keys = flatten_keys(data)
321+
hidden_roots = {"dependencies", "environment_manager"}
321322
for key in keys:
323+
if state["file_id"] == "ark":
324+
root = key.split(".", 1)[0].split("[", 1)[0]
325+
if root in hidden_roots:
326+
continue
322327
QListWidgetItem(key, outline)
323328

324329
errs, warns = validate_payload(state["file_id"], data)

0 commit comments

Comments
 (0)