From 1219a783bd951c3677753922a7555499e9e7be0c Mon Sep 17 00:00:00 2001 From: Zhaofeng Miao <522856232@qq.com> Date: Mon, 10 Jul 2023 17:24:39 +0800 Subject: [PATCH] feat: bump up python to 3.8.0 --- normalizer/core.py | 5 +++-- tests/cases/executor_1/Dockerfile.expect | 2 +- tests/cases/executor_2/Dockerfile.expect | 2 +- tests/cases/executor_6/Dockerfile.expect | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/normalizer/core.py b/normalizer/core.py index 6053187..dc487b6 100644 --- a/normalizer/core.py +++ b/normalizer/core.py @@ -382,6 +382,7 @@ def normalize( :param dry_run: if True, dry_run the file dumps :param dockerfile: custom dockerfile path :param dockerfile_syntax: custom dockerfile syntax + :param _argv: other arguments :return: normalized Executor model @@ -618,7 +619,7 @@ def normalize( base_images, dep_tools = prelude(imports) jina_version = choose_jina_version(meta['jina']) - py_version = meta.get('python', '3.7.0') + py_version = meta.get('python', '3.8.0') jina_image_tag = get_jina_image_tag(jina_version, py_version) @@ -689,7 +690,7 @@ def normalize( new_dockerfile.set_entrypoint(entrypoint_value) if 'docarray' in meta and '__jina__.Dockerfile' not in str(dockerfile_path): - dockerfile.add_docarray_install(meta["docarray"]) + dockerfile.add_docarray_install(meta['docarray']) if not dry_run: dockerfile.dump(dockerfile_path) diff --git a/tests/cases/executor_1/Dockerfile.expect b/tests/cases/executor_1/Dockerfile.expect index 221cf8a..4616e27 100644 --- a/tests/cases/executor_1/Dockerfile.expect +++ b/tests/cases/executor_1/Dockerfile.expect @@ -1,7 +1,7 @@ # This file is automatically generated by Jina executor normalizer plugin. # It is not intended for manual editing. -FROM jinaai/jina:2-py37-perf +FROM jinaai/jina:2-py38-perf # setup the workspace COPY . /workspace diff --git a/tests/cases/executor_2/Dockerfile.expect b/tests/cases/executor_2/Dockerfile.expect index 221cf8a..4616e27 100644 --- a/tests/cases/executor_2/Dockerfile.expect +++ b/tests/cases/executor_2/Dockerfile.expect @@ -1,7 +1,7 @@ # This file is automatically generated by Jina executor normalizer plugin. # It is not intended for manual editing. -FROM jinaai/jina:2-py37-perf +FROM jinaai/jina:2-py38-perf # setup the workspace COPY . /workspace diff --git a/tests/cases/executor_6/Dockerfile.expect b/tests/cases/executor_6/Dockerfile.expect index e8ee4d7..542d589 100644 --- a/tests/cases/executor_6/Dockerfile.expect +++ b/tests/cases/executor_6/Dockerfile.expect @@ -2,7 +2,7 @@ # This file is automatically generated by Jina executor normalizer plugin. # It is not intended for manual editing. -FROM jinaai/jina:2-py37-perf +FROM jinaai/jina:2-py38-perf # setup the workspace COPY . /workspace