Skip to content

Commit 447dfed

Browse files
author
Gitar
committed
Rule 20
1 parent 8a842b0 commit 447dfed

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.vscode/settings.template.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,7 @@
7070
],
7171
"isort.args": [
7272
"--settings-path=${workspaceFolder}/.isort.cfg"
73-
]
73+
],
74+
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
75+
"python.pythonPath": "${workspaceFolder}/.venv/bin/python"
7476
}

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ CPU_COUNT = $(shell cat /proc/cpuinfo | grep processor | wc -l )
261261
$(eval TMP_PATH_TO_FILESTASH_CONFIG=$(shell set -o allexport && \
262262
source $(CURDIR)/.env && \
263263
set +o allexport && \
264-
python3 scripts/filestash/create_config.py))
264+
python3.10 scripts/filestash/create_config.py))
265265
# Creating config for ops stack to $@
266266
# -> filestash config at $(TMP_PATH_TO_FILESTASH_CONFIG)
267267
@$(shell \
@@ -494,7 +494,7 @@ pylint: ## Runs python linter framework's wide
494494

495495
.PHONY: new-service
496496
new-service: .venv ## Bakes a new project from cookiecutter-simcore-pyservice and drops it under services/ [UNDER DEV]
497-
$</bin/pip3 --quiet install cookiecutter
497+
$</bin/pip3.10 --quiet install cookiecutter
498498
.venv/bin/cookiecutter gh:itisfoundation/cookiecutter-simcore-pyservice --output-dir $(CURDIR)/services
499499

500500

@@ -633,7 +633,7 @@ info: ## displays setup information
633633
@echo ' make : $(shell make --version 2>&1 | head -n 1)'
634634
@echo ' jq : $(shell jq --version)'
635635
@echo ' awk : $(shell awk -W version 2>&1 | head -n 1)'
636-
@echo ' python : $(shell python3 --version)'
636+
@echo ' python : $(shell python3 --version) [Expected: Python 3.10]'
637637
@echo ' node : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
638638
@echo ' docker : $(shell docker --version)'
639639
@echo ' docker buildx : $(shell docker buildx version)'

scripts/common.Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ inf%: ## displays basic info
100100
@echo ' jq : $(shell jq --version)'
101101
@echo ' awk : $(shell awk -W version 2>&1 | head -n 1)'
102102
@echo ' node : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
103-
@echo ' python : $(shell python3 --version)'
103+
@echo ' python : $(shell python3 --version) [Expected: Python $(EXPECTED_PYTHON_VERSION)]'
104104
# installed in .venv
105105
@pip list
106106
# package setup

0 commit comments

Comments
 (0)