Skip to content

Commit 85e8f32

Browse files
author
Gitar
committed
Checkpoint AFTER step 19 - Rule 20
Timestamp: 2025-06-02 14:55:23.746 Step ID: 19 Title: Rule 20
1 parent e6d0636 commit 85e8f32

File tree

18 files changed

+26
-24
lines changed

18 files changed

+26
-24
lines changed

.vscode/settings.template.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
"ruff.path": [
6464
"${workspaceFolder}/.venv/bin/ruff"
6565
],
66+
"python.defaultInterpreterPath": "python3.10",
67+
"python.pythonPath": "python3.10",
6668
"shellcheck.executablePath": "${workspaceFolder}/scripts/shellcheck.bash",
6769
"shellcheck.run": "onSave",
6870
"shellcheck.enableQuickFix": true

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ test_python_version: ## Check Python version, throw error if compilation would f
137137
.PHONY: _check_venv_active
138138
_check_venv_active:
139139
# Checking whether virtual environment was activated
140-
@python3 -c "import sys; assert sys.base_prefix!=sys.prefix"
140+
@python3.10 -c "import sys; assert sys.base_prefix!=sys.prefix"
141141

142142

143143
## DOCKER BUILD -------------------------------
@@ -500,7 +500,7 @@ push-version: tag-version
500500

501501

502502
.venv: .check-uv-installed
503-
@uv venv $@
503+
@uv venv $@ --python python3.10
504504
@echo "# upgrading tools to latest version in" && $@/bin/python --version
505505
@uv pip --quiet install --upgrade \
506506
pip~=24.0 \
@@ -740,7 +740,7 @@ info-tools: ## displays tools versions
740740
@echo ' jq : $(shell jq --version)'
741741
@echo ' make : $(shell make --version 2>&1 | head -n 1)'
742742
@echo ' node : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
743-
@echo ' python : $(shell python3 --version)'
743+
@echo ' python : $(shell python3.10 --version)'
744744
@echo ' uv : $(shell uv --version 2> /dev/null || echo ERROR uv missing)'
745745
@echo ' ubuntu : $(shell lsb_release --description --short 2> /dev/null | tail || echo ERROR Not an Ubuntu OS )'
746746

api/specs/web-server/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.PHONY: _check_venv_active
44
_check_venv_active:
55
# Checking whether virtual environment was activated
6-
@python3 -c "import sys; assert sys.base_prefix!=sys.prefix"
6+
@python3.10 -c "import sys; assert sys.base_prefix!=sys.prefix"
77

88

99
.PHONY: install
@@ -15,7 +15,7 @@ install-dev install: _check_venv_active
1515

1616
.PHONY: all
1717
all: _check_venv_active install
18-
python openapi.py
18+
python3.10 openapi.py
1919

2020
.PHONY: openapi-specs
2121
openapi-specs: all

api/tests/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ help: ## this colorful help
5959
.PHONY: _check_venv_active
6060
_check_venv_active:
6161
# checking whether virtual environment was activated
62-
@python3 -c "import sys; assert sys.base_prefix!=sys.prefix"
62+
@python3.10 -c "import sys; assert sys.base_prefix!=sys.prefix"

packages/models-library/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ docker_rest_api.py: ## auto-generates pydantic models for Docker REST API models
7878
.PHONY: _erdantic
7979
_erdantic: _check_venv_active
8080
# ensures erdantic installed
81-
@python3 -c "import erdantic" 2>/dev/null || uv pip install erdantic
81+
@python3.10 -c "import erdantic" 2>/dev/null || uv pip install erdantic
8282

8383
erd-Project.svg: _erdantic
8484
erdantic models_library.projects.Project \
@@ -106,13 +106,13 @@ DOWNLOADED_TEST_DATA_DIR = "$(CURDIR)/tests/data/.downloaded-ignore"
106106
.PHONY: _httpx
107107
_ensure_httpx: _check_venv_active
108108
# ensures requirements installed
109-
@python3 -c "import httpx" 2>/dev/null || uv pip install httpx
109+
@python3.10 -c "import httpx" 2>/dev/null || uv pip install httpx
110110

111111
PHONY: tests-data
112112
tests-data: $(DOT_ENV_FILE) _ensure_httpx ## downloads tests data from registry defined in .env (time-intensive!)
113113
# Downloading all metadata files ...
114114
@set -o allexport; \
115115
source $<; \
116116
set +o allexport; \
117-
python3 "$(PACKAGES_DIR)/pytest-simcore/src/pytest_simcore/helpers/docker_registry.py" $(DOWNLOADED_TEST_DATA_DIR)
117+
python3.10 "$(PACKAGES_DIR)/pytest-simcore/src/pytest_simcore/helpers/docker_registry.py" $(DOWNLOADED_TEST_DATA_DIR)
118118
@echo "Run now 'pytest -vv -m diagnostics tests'"

packages/pytest-simcore/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include ../../scripts/common.Makefile
77
.PHONY: install-dev install-prod
88
install-dev install-prod: _check_venv_active ## install app in development/production or CI mode
99
# installing in $(subst install-,,$@) mode
10-
python -m pip install $(if $(findstring dev,$@),--editable,) .
10+
python3.10 -m pip install $(if $(findstring dev,$@),--editable,) .
1111

1212

1313
.PHONY: tests

requirements/tools/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ info: ## displays some info
5454
@echo ' jq : $(shell jq --version 2> /dev/null || echo missing)'
5555
@echo ' awk : $(shell awk -W version 2>&1 | head -n 1)'
5656
@echo ' node : $(shell node --version 2> /dev/null || echo missing)'
57-
@echo ' python : $(shell python3 --version)'
57+
@echo ' python : $(shell python3.10 --version)'
5858
# installed in .venv
5959
@pip list
6060
# target reqs found
@@ -143,7 +143,7 @@ guard-%:
143143

144144
.PHONY: report
145145
report: ## generates a report of updated requirements that shall be pasted in the PR
146-
@python check_changes.py --changed-reqs > report.ignore.md
147-
@python check_changes.py >> report.ignore.md
146+
@python3.10 check_changes.py --changed-reqs > report.ignore.md
147+
@python3.10 check_changes.py >> report.ignore.md
148148
@cat report.ignore.md
149149
@echo SEE $(shell realpath report.ignore.md)

scripts/metrics/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHELL := /bin/bash
44

55
install:
66
# creating python virtual environment
7-
@python3 -m venv .venv
7+
@python3.10 -m venv .venv
88
# installing python dependencies
99
@.venv/bin/pip install --upgrade pip setuptools wheel
1010
@.venv/bin/pip install -r requirements.txt

services/api-server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ define _create_and_validate_openapi
3030
# generating openapi specs file under $< (NOTE: Skips DEV FEATURES since this OAS is the 'offically released'!)
3131
@source .env; \
3232
export API_SERVER_DEV_FEATURES_ENABLED=$1; \
33-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
33+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
3434

3535
# validates OAS file: $@
3636
docker run --rm \

services/catalog/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ openapi.json: .env-ignore
1717
@set -o allexport; \
1818
source $<; \
1919
set +o allexport; \
20-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
20+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
2121

2222
# validates OAS file: $@
2323
$(call validate_openapi_specs,$@)

services/director-v2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ openapi.json: .env
1818
@set -o allexport; \
1919
source .env; \
2020
set +o allexport; \
21-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
21+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
2222

2323

2424
DOCKER_API_VERSION ?= 1.41

services/dynamic-scheduler/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ openapi.json: .env-ignore ## produces openapi.json
1515
@set -o allexport; \
1616
source $<; \
1717
set +o allexport; \
18-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
18+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@

services/invitations/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ openapi.json: .env-ignore ## produces openapi.json
1717
@set -o allexport; \
1818
source $<; \
1919
set +o allexport; \
20-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
20+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
2121

2222

2323
#

services/notifications/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ openapi.json: .env-ignore ## produces openapi.json
1515
@set -o allexport; \
1616
source $<; \
1717
set +o allexport; \
18-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
18+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@

services/payments/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ openapi.json: .env-ignore ## produces openapi.json
1515
@set -o allexport; \
1616
source $<; \
1717
set +o allexport; \
18-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
18+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
1919

2020

2121
# NOTE: Create using `ln -s path/to/osparc-config/repo.config .env-secret`

services/resource-usage-tracker/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ include ../../scripts/common-service.Makefile
1010
openapi-specs: openapi.json
1111
openapi.json: ## produces openapi.json
1212
# generating openapi specs file (need to have the environment set for this)
13-
@python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
13+
@python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@

services/static-webserver/client/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ compile: ## qx compiles host' 'source' -> image's 'build-output'
5252
--build-arg VCS_STATUS_CLIENT=${VCS_STATUS_CLIENT} \
5353
--build-arg VCS_URL=${VCS_URL} \
5454
--target=build-client .
55-
python ./scripts/post-compile.py
55+
python3.10 ./scripts/post-compile.py
5656

5757
touch: ## minimal image build with /project/output-build inside
5858
# touch /project/output-build such that multi-stage 'services/web/Dockerfile' can build development target (fixes #1097)

services/storage/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ openapi.json: .env
1212
@set -o allexport; \
1313
source $<; \
1414
set +o allexport; \
15-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app.openapi(), indent=2) )" > $@
15+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app.openapi(), indent=2) )" > $@
1616

1717
# validates OAS file: $@
1818
$(call validate_openapi_specs,$@)

0 commit comments

Comments
 (0)