Merge branch 'master' into pre-commit-ci-update-config

neuro-inc · Dec 16, 2024 · e615e73 · e615e73
2 parents 8a0f580 + 98caf91
commit e615e73
Show file tree

Hide file tree

Showing 38 changed files with 210 additions and 197 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,11 @@
 
 [comment]: # (towncrier release notes start)
 
-# Apolo Flow 24.10.0 (2024-10-23)
+# Apolo Flow 24.12.1 (2024-12-16)
 
 ### Features
 
-- Provide `flow.username` in both *live* and *batch* modes. ([#1175](https://github.com/neuro-inc/neuro-flow/issues/1175))
+- Prefer `.apolo` over `.neuro` for config files and logs. ([#1192](https://github.com/neuro-inc/neuro-flow/issues/1192))
 
 
 # Apolo Flow 24.10.0 (2024-10-23)

diff --git a/examples/demo-jobs/.neuro/batch-action.yml → examples/demo-jobs/.apolo/batch-action.yml b/examples/demo-jobs/.neuro/batch-action.yml → examples/demo-jobs/.apolo/batch-action.yml
diff --git a/...es/demo-jobs/.neuro/batch-pass-config.yml → ...es/demo-jobs/.apolo/batch-pass-config.yml b/...es/demo-jobs/.neuro/batch-pass-config.yml → ...es/demo-jobs/.apolo/batch-pass-config.yml
diff --git a/...es/demo-jobs/.neuro/batch-with-action.yml → ...es/demo-jobs/.apolo/batch-with-action.yml b/...es/demo-jobs/.neuro/batch-with-action.yml → ...es/demo-jobs/.apolo/batch-with-action.yml
diff --git a/...les/demo-jobs/.neuro/batch-with-image.yml → ...les/demo-jobs/.apolo/batch-with-image.yml b/...les/demo-jobs/.neuro/batch-with-image.yml → ...les/demo-jobs/.apolo/batch-with-image.yml
diff --git a/...les/demo-jobs/.neuro/batch-with-local.yml → ...les/demo-jobs/.apolo/batch-with-local.yml b/...les/demo-jobs/.neuro/batch-with-local.yml → ...les/demo-jobs/.apolo/batch-with-local.yml
diff --git a/examples/demo-jobs/.neuro/jupyter.yml → examples/demo-jobs/.apolo/jupyter.yml b/examples/demo-jobs/.neuro/jupyter.yml → examples/demo-jobs/.apolo/jupyter.yml
diff --git a/examples/demo-jobs/.neuro/live.yml → examples/demo-jobs/.apolo/live.yml b/examples/demo-jobs/.neuro/live.yml → examples/demo-jobs/.apolo/live.yml
diff --git a/examples/demo-jobs/.neuro/matrix.yml → examples/demo-jobs/.apolo/matrix.yml b/examples/demo-jobs/.neuro/matrix.yml → examples/demo-jobs/.apolo/matrix.yml
diff --git a/examples/demo-jobs/.neuro/project.yaml → examples/demo-jobs/.apolo/project.yaml b/examples/demo-jobs/.neuro/project.yaml → examples/demo-jobs/.apolo/project.yaml
diff --git a/examples/demo-jobs/.neuro/seq.yml → examples/demo-jobs/.apolo/seq.yml b/examples/demo-jobs/.neuro/seq.yml → examples/demo-jobs/.apolo/seq.yml
diff --git a/.../demo-jobs/.neuro/upload-local-action.yml → .../demo-jobs/.apolo/upload-local-action.yml b/.../demo-jobs/.neuro/upload-local-action.yml → .../demo-jobs/.apolo/upload-local-action.yml
diff --git a/examples/demo-jobs/Dockerfile b/examples/demo-jobs/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/neuro-inc/base:v24.11.0-runtime
+FROM ghcr.io/neuro-inc/base:v24.12.0-runtime
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/examples/tst-hang/.neuro/tst-action.yml → examples/tst-hang/.apolo/tst-action.yml b/examples/tst-hang/.neuro/tst-action.yml → examples/tst-hang/.apolo/tst-action.yml
diff --git a/examples/tst-hang/.neuro/tst.yml → examples/tst-hang/.apolo/tst.yml b/examples/tst-hang/.neuro/tst.yml → examples/tst-hang/.apolo/tst.yml
diff --git a/reference/cli.md b/reference/cli.md
@@ -12,7 +12,7 @@ apolo-flow [OPTIONS] COMMAND [ARGS]...
 
 | Name | Description |
 | :--- | :--- |
-| _--config PATH_ | Path to a directory with .neuro folder inside, automatic lookup is performed if not set \(default\) |
+| _--config PATH_ | Path to a directory with .apolo folder inside, automatic lookup is performed if not set \(default\) |
 | _-v, --verbose_ | Give more output. Option is additive, and can be used up to 2 times. |
 | _-q, --quiet_ | Give less output. Option is additive, and can be used up to 2 times. |
 | _--show-traceback_ | Show python traceback on error, useful for debugging the tool. |