Skip to content

Commit 2e937f8

Browse files
committed
put python instead of python3.9 in makefile
1 parent bee8c02 commit 2e937f8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Makefile variables set automatically
2-
plugin_id=`cat plugin.json | python3.9 -c "import sys, json; print(str(json.load(sys.stdin)['id']).replace('/',''))"`
3-
plugin_version=`cat plugin.json | python3.9 -c "import sys, json; print(str(json.load(sys.stdin)['version']).replace('/',''))"`
2+
plugin_id=`cat plugin.json | python -c "import sys, json; print(str(json.load(sys.stdin)['id']).replace('/',''))"`
3+
plugin_version=`cat plugin.json | python -c "import sys, json; print(str(json.load(sys.stdin)['version']).replace('/',''))"`
44
archive_file_name="dss-plugin-${plugin_id}-${plugin_version}.zip"
55
remote_url=`git config --get remote.origin.url`
66
last_commit_id=`git rev-parse HEAD`
@@ -21,13 +21,13 @@ plugin:
2121
unit-tests:
2222
@echo "Running unit tests..."
2323
@( \
24-
PYTHON_VERSION=`python3.9 -V 2>&1 | sed 's/[^0-9]*//g' | cut -c 1,2`; \
25-
PYTHON_VERSION_IS_CORRECT=`cat code-env/python/desc.json | python3.9 -c "import sys, json; print(str($$PYTHON_VERSION) in [x[-2:] for x in json.load(sys.stdin)['acceptedPythonInterpreters']]);"`; \
24+
PYTHON_VERSION=`python -V 2>&1 | sed 's/[^0-9]*//g' | cut -c 1,2`; \
25+
PYTHON_VERSION_IS_CORRECT=`cat code-env/python/desc.json | python -c "import sys, json; print(str($$PYTHON_VERSION) in [x[-2:] for x in json.load(sys.stdin)['acceptedPythonInterpreters']]);"`; \
2626
if [ $$PYTHON_VERSION_IS_CORRECT == "False" ]; then echo "Python version $$PYTHON_VERSION is not in acceptedPythonInterpreters"; exit 1; else echo "Python version $$PYTHON_VERSION is in acceptedPythonInterpreters"; fi; \
2727
)
2828
@( \
2929
rm -rf ./env/; \
30-
python3.9 -m venv env/; \
30+
python -m venv env/; \
3131
source env/bin/activate; \
3232
pip install --upgrade pip;\
3333
pip install --no-cache-dir -r tests/python/unit/requirements.txt; \
@@ -40,9 +40,9 @@ integration-tests:
4040
@echo "Running integration tests..."
4141
@( \
4242
rm -rf ./env/; \
43-
python3.9 -m venv env/; \
43+
python -m venv env/; \
4444
source env/bin/activate; \
45-
pip3 install --upgrade pip;\
45+
pip install --upgrade pip;\
4646
pip install --no-cache-dir -r tests/python/integration/requirements.txt; \
4747
pytest tests/python/integration --alluredir=tests/allure_report || ret=$$?; exit $$ret \
4848
)

0 commit comments

Comments
 (0)