This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v3-4-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v3-4-test by this push:
new d8bae18d509 [v3-4-test] Fix CI image build after mprocs was renamed to
dekit (#74715) (#75224)
d8bae18d509 is described below
commit d8bae18d50922cca60b1d78c5de52816845ceb03
Author: Jarek Potiuk <[email protected]>
AuthorDate: Tue Oct 20 17:50:52 2026 +0200
[v3-4-test] Fix CI image build after mprocs was renamed to dekit (#74715)
(#75224)
(cherry picked from commit 937dfb6894d7557458a104b93ad7adc85f007253)
Generated-by: Claude Opus 5
Co-authored-by: Wei Lee <[email protected]>
---
Dockerfile.ci | 4 +--
scripts/ci/prek/upgrade_important_versions.py | 2 +-
scripts/in_container/bin/generate_mprocs_config.py | 3 +-
.../in_container/test_generate_mprocs_config.py | 39 ++++++++++++++++++++++
4 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 3766abbf043..e3b69246c47 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1828,10 +1828,10 @@ ARG MPROCS_VERSION="0.10.2"
RUN SYSTEM=$(uname -s | tr '[:upper:]' '[:lower:]') \
&& PLATFORM="$(uname -m)" \
- &&
MPROCS_URL="https://github.com/pvolok/mprocs/releases/download/v${MPROCS_VERSION}/mprocs-${MPROCS_VERSION}-${SYSTEM}-${PLATFORM}-musl.tar.gz";
\
+ &&
MPROCS_URL="https://github.com/pvolok/dekit/releases/download/v${MPROCS_VERSION}/dekit-${PLATFORM}-unknown-${SYSTEM}-musl.tar.gz";
\
&& echo "Downloading mprocs from ${MPROCS_URL}" \
&& curl --silent --location --fail --retry 3 --retry-delay 5 -o
/tmp/mprocs.tar.gz "${MPROCS_URL}" \
- && tar -xzf /tmp/mprocs.tar.gz -C /usr/local/bin/ mprocs \
+ && tar -xzf /tmp/mprocs.tar.gz -O dekit > /usr/local/bin/mprocs \
&& rm -f /tmp/mprocs.tar.gz \
&& chmod +x /usr/local/bin/mprocs
diff --git a/scripts/ci/prek/upgrade_important_versions.py
b/scripts/ci/prek/upgrade_important_versions.py
index 3c8bc2fda77..987d4f61449 100755
--- a/scripts/ci/prek/upgrade_important_versions.py
+++ b/scripts/ci/prek/upgrade_important_versions.py
@@ -942,7 +942,7 @@ def fetch_all_package_versions() -> dict[str, str]:
"protoc": get_latest_image_version("rvolosatovs/protoc") if
UPGRADE_PROTOC else "",
"alpine": get_latest_image_version("alpine") if UPGRADE_ALPINE else "",
"busybox": get_latest_image_version("busybox") if UPGRADE_BUSYBOX else
"",
- "mprocs": get_latest_github_release_version("pvolok/mprocs") if
UPGRADE_MPROCS else "",
+ "mprocs": get_latest_github_release_version("pvolok/dekit") if
UPGRADE_MPROCS else "",
"openapi_generator": get_latest_openapi_generator_version() if
UPGRADE_OPENAPI_GENERATOR else "",
"sphinx_airflow_theme": get_latest_sphinx_airflow_theme_version()
if UPGRADE_SPHINX_AIRFLOW_THEME
diff --git a/scripts/in_container/bin/generate_mprocs_config.py
b/scripts/in_container/bin/generate_mprocs_config.py
index 22faa7ce043..a092892551e 100755
--- a/scripts/in_container/bin/generate_mprocs_config.py
+++ b/scripts/in_container/bin/generate_mprocs_config.py
@@ -182,7 +182,8 @@ def generate_mprocs_config() -> str:
}
# Generate YAML output
- config_dict = {"procs": procs}
+ # dekit/mprocs 0.10.x: default <q> opens a quit menu (ShowQuit); override
to quit immediately.
+ config_dict = {"procs": procs, "keymap_procs": {"<q>": {"c": "quit"}}}
return yaml.dump(config_dict, default_flow_style=False, sort_keys=False)
diff --git a/scripts/tests/in_container/test_generate_mprocs_config.py
b/scripts/tests/in_container/test_generate_mprocs_config.py
new file mode 100644
index 00000000000..24b6179f9a4
--- /dev/null
+++ b/scripts/tests/in_container/test_generate_mprocs_config.py
@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+import importlib.util
+from pathlib import Path
+
+import yaml
+
+MODULE_PATH = Path(__file__).parents[2] / "in_container" / "bin" /
"generate_mprocs_config.py"
+
+
+def load_module():
+ spec = importlib.util.spec_from_file_location("generate_mprocs_config",
MODULE_PATH)
+ module = importlib.util.module_from_spec(spec)
+ spec.loader.exec_module(module)
+ return module
+
+
+def test_quit_key_quits_immediately():
+ module = load_module()
+
+ config = yaml.safe_load(module.generate_mprocs_config())
+
+ assert config["keymap_procs"] == {"<q>": {"c": "quit"}}
