This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new e7ca97f3c66 kie-tools-issues#2260: Use python3 instead of python
(#2261)
e7ca97f3c66 is described below
commit e7ca97f3c66a9e4ce47f57d0ef9ee70c9ba4fbef
Author: Tomáš David <[email protected]>
AuthorDate: Thu Apr 25 17:35:46 2024 +0200
kie-tools-issues#2260: Use python3 instead of python (#2261)
---
devbox.json | 2 +-
packages/kogito-swf-builder/install.js | 2 +-
packages/kogito-swf-builder/package.json | 2 +-
packages/kogito-swf-common/install.js | 2 +-
packages/kogito-swf-common/package.json | 2 +-
packages/kogito-swf-common/resources/Makefile | 4 ++--
packages/kogito-swf-common/resources/scripts/retrieve_version.py | 4 ++--
packages/kogito-swf-common/resources/scripts/versions_manager.py | 4 ++--
packages/kogito-swf-devmode/install.js | 2 +-
packages/kogito-swf-devmode/package.json | 2 +-
packages/python-venv/README.md | 2 +-
packages/python-venv/package.json | 4 ++--
.../sw-editor/sw-editor-kogito-app/README.md | 2 +-
repo/build-dependencies-versions.json | 4 ++--
scripts/bootstrap/check_required_preinstalled_cli_commands.mjs | 4 ++--
15 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/devbox.json b/devbox.json
index 9ab08fec2e4..108bc0d9e34 100644
--- a/devbox.json
+++ b/devbox.json
@@ -26,7 +26,7 @@
],
"scripts": {
"versions": [
- "java --version && mvn -v && node -v && pnpm -v && go version && helm
version && make -v && python --version && pip --version"
+ "java --version && mvn -v && node -v && pnpm -v && go version && helm
version && make -v && python3 --version && pip3 --version"
]
}
}
diff --git a/packages/kogito-swf-builder/install.js
b/packages/kogito-swf-builder/install.js
index 657a587ccff..ccef84505c5 100644
--- a/packages/kogito-swf-builder/install.js
+++ b/packages/kogito-swf-builder/install.js
@@ -31,6 +31,6 @@ const activateCmd =
execSync(
`${activateCmd} && \
- python ${kogitoSwfCommonDir}/resources/scripts/versions_manager.py --bump-to
${buildEnv.env.kogitoSwfBuilder.version} --source-folder ./resources`,
+ python3 ${kogitoSwfCommonDir}/resources/scripts/versions_manager.py
--bump-to ${buildEnv.env.kogitoSwfBuilder.version} --source-folder ./resources`,
{ stdio: "inherit" }
);
diff --git a/packages/kogito-swf-builder/package.json
b/packages/kogito-swf-builder/package.json
index 8c096758ea7..6dee50f1457 100644
--- a/packages/kogito-swf-builder/package.json
+++ b/packages/kogito-swf-builder/package.json
@@ -38,7 +38,7 @@
},
"kieTools": {
"requiredPreinstalledCliCommands": [
- "python",
+ "python3",
"make",
"s2i"
]
diff --git a/packages/kogito-swf-common/install.js
b/packages/kogito-swf-common/install.js
index 113596d107a..bfad9eb1271 100644
--- a/packages/kogito-swf-common/install.js
+++ b/packages/kogito-swf-common/install.js
@@ -30,6 +30,6 @@ const activateCmd =
execSync(
`${activateCmd} && \
- python ./resources/scripts/versions_manager.py --bump-to
${buildEnv.env.kogitoSwfCommon.version} --source-folder ./resources`,
+ python3 ./resources/scripts/versions_manager.py --bump-to
${buildEnv.env.kogitoSwfCommon.version} --source-folder ./resources`,
{ stdio: "inherit" }
);
diff --git a/packages/kogito-swf-common/package.json
b/packages/kogito-swf-common/package.json
index cd82f610375..e2993315891 100644
--- a/packages/kogito-swf-common/package.json
+++ b/packages/kogito-swf-common/package.json
@@ -21,7 +21,7 @@
},
"kieTools": {
"requiredPreinstalledCliCommands": [
- "python",
+ "python3",
"make"
]
}
diff --git a/packages/kogito-swf-common/resources/Makefile
b/packages/kogito-swf-common/resources/Makefile
index a59ff0483eb..4fac0a38963 100644
--- a/packages/kogito-swf-common/resources/Makefile
+++ b/packages/kogito-swf-common/resources/Makefile
@@ -24,7 +24,7 @@ BUILD_ENGINE ?= docker
BUILD_ENGINE_OPTIONS ?=
# Resolving the current image version from the kogito.project.versions module.
Cekit will use it to tag the image.
-CURRENT_IMAGE_VERSION := $(shell python scripts/retrieve_version.py)
+CURRENT_IMAGE_VERSION := $(shell python3 scripts/retrieve_version.py)
# SWF Image creation envs
SWF_IMAGE_NAME ?= # Image name
@@ -51,7 +51,7 @@ endif
# Upgrade Quarkus & Kogito versions in the images and modules
_run_version_manager:
ifneq ($(QUARKUS_PLATFORM_VERSION)$(KOGITO_VERSION),)
- python scripts/versions_manager.py --quarkus-version
${QUARKUS_PLATFORM_VERSION} --kogito-version ${KOGITO_VERSION}
+ python3 scripts/versions_manager.py --quarkus-version
${QUARKUS_PLATFORM_VERSION} --kogito-version ${KOGITO_VERSION}
endif
_fix_platform_versions: _check_versions _run_version_manager
diff --git a/packages/kogito-swf-common/resources/scripts/retrieve_version.py
b/packages/kogito-swf-common/resources/scripts/retrieve_version.py
index fa103b3836f..8140e56001c 100644
--- a/packages/kogito-swf-common/resources/scripts/retrieve_version.py
+++ b/packages/kogito-swf-common/resources/scripts/retrieve_version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,7 +20,7 @@
#Script responsible to update the tests with
#Should be run from root directory of the repository
-#Sample usage: python scripts/retrieve_version.py
+#Sample usage: python3 scripts/retrieve_version.py
import sys
sys.dont_write_bytecode = True
diff --git a/packages/kogito-swf-common/resources/scripts/versions_manager.py
b/packages/kogito-swf-common/resources/scripts/versions_manager.py
index b7cf6c0b22b..94f21b563ed 100644
--- a/packages/kogito-swf-common/resources/scripts/versions_manager.py
+++ b/packages/kogito-swf-common/resources/scripts/versions_manager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,7 +20,7 @@
#Script responsible to update the tests with
#Should be run from root directory of the repository
-#Sample usage: python scripts/retrieve_version.py
+#Sample usage: python3 scripts/retrieve_version.py
import sys
import argparse
diff --git a/packages/kogito-swf-devmode/install.js
b/packages/kogito-swf-devmode/install.js
index 4d0d202e9c0..976569bb405 100644
--- a/packages/kogito-swf-devmode/install.js
+++ b/packages/kogito-swf-devmode/install.js
@@ -31,6 +31,6 @@ const activateCmd =
execSync(
`${activateCmd} && \
- python ${kogitoSwfCommonDir}/resources/scripts/versions_manager.py --bump-to
${buildEnv.env.kogitoSwfDevMode.version} --source-folder ./resources`,
+ python3 ${kogitoSwfCommonDir}/resources/scripts/versions_manager.py
--bump-to ${buildEnv.env.kogitoSwfDevMode.version} --source-folder ./resources`,
{ stdio: "inherit" }
);
diff --git a/packages/kogito-swf-devmode/package.json
b/packages/kogito-swf-devmode/package.json
index eaa3d7d470d..ea76a775a5e 100644
--- a/packages/kogito-swf-devmode/package.json
+++ b/packages/kogito-swf-devmode/package.json
@@ -38,7 +38,7 @@
},
"kieTools": {
"requiredPreinstalledCliCommands": [
- "python",
+ "python3",
"make",
"s2i"
]
diff --git a/packages/python-venv/README.md b/packages/python-venv/README.md
index d488de7df1f..1a256845a93 100644
--- a/packages/python-venv/README.md
+++ b/packages/python-venv/README.md
@@ -2,4 +2,4 @@
This package manages the Python venv to be used by all other packages when
running python scripts.
-It will install all packages necessary using `pip`.
+It will install all packages necessary using `pip3`.
diff --git a/packages/python-venv/package.json
b/packages/python-venv/package.json
index f1e39a712ae..bbb6d198908 100644
--- a/packages/python-venv/package.json
+++ b/packages/python-venv/package.json
@@ -6,9 +6,9 @@
"license": "Apache-2.0",
"keywords": [],
"scripts": {
- "install": "python -m venv ./venv && run-script-os",
+ "install": "python3 -m venv ./venv && run-script-os",
"install:linux:darwin": ". ./venv/bin/activate && pnpm install:pip",
- "install:pip": "pip install cekit==4.11.0 behave==1.2.6 lxml==5.2.1
docker==7.0.0 docker-squash==1.2.0 elementpath==4.4.0 pyyaml==6.0.1
ruamel.yaml==0.18.6 python-dateutil==2.9.0.post0 Jinja2==3.1.3 pykwalify==1.8.0
colorlog==6.8.2 click==8.1.7",
+ "install:pip": "pip3 install cekit==4.11.0 behave==1.2.6 lxml==5.2.1
docker==7.0.0 docker-squash==1.2.0 elementpath==4.4.0 pyyaml==6.0.1
ruamel.yaml==0.18.6 python-dateutil==2.9.0.post0 Jinja2==3.1.3 pykwalify==1.8.0
colorlog==6.8.2 click==8.1.7",
"install:win32": ".\\venv\\Scripts\\Activate.bat && pnpm install:pip"
},
"devDependencies": {
diff --git
a/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/README.md
b/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/README.md
index 4d7612d381c..9a558a7df8c 100644
---
a/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/README.md
+++
b/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/README.md
@@ -30,7 +30,7 @@ Change to the
`kie-tools/packages/serverless-workflow-diagram-editor/` root fold
- set compilationLevel of j2cl-maven-plugin to `BUNDLE_JAR` in
`kie-tools/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/pom.xml`
- run `mvn clean org.kie.j2cl.tools:j2cl-maven-plugin:watch` in the
`kie-tools/packages/serverless-workflow-diagram-editor` root folder
- once the build is finished (there will be `Build Complete: ready for browser
refresh` in the terminal window), open another terminal in
`kie-tools/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/target/sw-editor-kogito-app/org.kie.workbench.common.stunner.sw.KogitoSWEditor`
folder
-- start a local web server by: `python -m SimpleHTTPServer 8001` or
`http-server -p 8001` or any other web server
+- start a local web server by: `python3 -m SimpleHTTPServer 8001` or
`http-server -p 8001` or any other web server
- Navigate to `http://localhost:8001/test.html`
In any question, please follow the j2cl-maven-plugin documentation
diff --git a/repo/build-dependencies-versions.json
b/repo/build-dependencies-versions.json
index 4c459d22877..769d74e00c7 100644
--- a/repo/build-dependencies-versions.json
+++ b/repo/build-dependencies-versions.json
@@ -4,6 +4,6 @@
"maven": "3.9.6",
"node": "18.14.0",
"pnpm": "8.7.0",
- "python": "3.12.2",
- "pip": "24.0"
+ "python3": "3.12.2",
+ "pip3": "24.0"
}
diff --git a/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
b/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
index e6491346338..02f725435a8 100755
--- a/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
+++ b/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
@@ -31,8 +31,8 @@ const argsByCommand = new Map([
["go", ["version"]],
["make", ["-v"]],
["helm", ["version"]],
- ["python", ["--version"]],
- ["pip", ["--version"]],
+ ["python3", ["--version"]],
+ ["pip3", ["--version"]],
["s2i", ["version"]],
]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
