Skip to content

Commit a2fe83a

Browse files
author
Gitar
committed
Checkpoint AFTER step 19 - Rule 20
Timestamp: 2025-06-02 19:37:33.351 Step ID: 19 Title: Rule 20
1 parent 60caeea commit a2fe83a

File tree

8 files changed

+18
-17
lines changed

8 files changed

+18
-17
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
exclude: "^.venv$|^.cache$|^.pytest_cache$"
33
fail_fast: true
44
default_language_version:
5-
python: python3.9
5+
python: python3.10
66
repos:
77
- repo: https://github.com/pre-commit/pre-commit-hooks
88
rev: v4.2.0
@@ -26,7 +26,7 @@ repos:
2626
hooks:
2727
- id: pyupgrade
2828
args:
29-
- "--py39-plus"
29+
- "--py310-plus"
3030
name: upgrade code
3131
- repo: https://github.com/hadialqattan/pycln
3232
rev: v1.2.5

.vscode/settings.template.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"**/.git/subtree-cache/**": true,
2828
"**/node_modules/*/**": true
2929
},
30+
"python.defaultInterpreterPath": "python3.10",
3031
"python.formatting.autopep8Args": [
3132
"--max-line-length 140"
3233
],

Makefile

Lines changed: 5 additions & 5 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 \
@@ -425,9 +425,9 @@ push-version: tag-version
425425
.PHONY: devenv devenv-all node-env
426426

427427
.venv:
428-
@python3 --version
429-
python3 -m venv $@
430-
## upgrading tools to latest version in $(shell python3 --version)
428+
@python3.10 --version
429+
python3.10 -m venv $@
430+
## upgrading tools to latest version in $(shell python3.10 --version)
431431
$@/bin/pip3 --quiet install --upgrade \
432432
pip~=23.0 \
433433
wheel \
@@ -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.10 --version)'
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)'

packages/models-library/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ tests-ci: ## runs unit tests [ci-mode]
5050

5151
.PHONY: project-jsonschema.ignore.json
5252
project-jsonschema.ignore.json: ## creates project-v0.0.1.json for DEV purposes
53-
python3 -c "from models_library.projects import Project; print(Project.schema_json(indent=2))" > $@
53+
python3.10 -c "from models_library.projects import Project; print(Project.schema_json(indent=2))" > $@
5454

5555
.PHONY: service-jsonschema.ignore.json
5656
node-meta-jsonschema.ignore.json: ## creates node-meta-v0.0.1.json for DEV purposes
57-
python3 -c "from models_library.services import ServiceDockerData as cls; print(cls.schema_json(indent=2))" > $@
57+
python3.10 -c "from models_library.services import ServiceDockerData as cls; print(cls.schema_json(indent=2))" > $@
5858

5959
DOCKER_API_VERSION ?= 1.41
6060
.PHONY: docker_rest_api.py
@@ -84,7 +84,7 @@ docker_rest_api.py: ## auto-generates pydantic models for Docker REST API models
8484
.PHONY: _erdantic
8585
_erdantic: _check_venv_active
8686
# ensures erdantic installed
87-
@python3 -c "import erdantic" 2>/dev/null || pip install erdantic
87+
@python3.10 -c "import erdantic" 2>/dev/null || pip install erdantic
8888

8989
erd-Project.svg: _erdantic
9090
erdantic models_library.projects.Project \
@@ -112,12 +112,12 @@ DOWNLOADED_TEST_DATA_DIR = "$(CURDIR)/tests/data/.downloaded-ignore"
112112
.PHONY: _httpx
113113
_httpx: _check_venv_active
114114
# ensures requirements installed
115-
@python3 -c "import httpx" 2>/dev/null || pip install httpx
115+
@python3.10 -c "import httpx" 2>/dev/null || pip install httpx
116116

117117
PHONY: pull_test_data
118118
pull_test_data: $(DOT_ENV_FILE) _httpx ## downloads tests data from registry (this can take some time!)
119119
# downloading all metadata files
120120
@set -o allexport; \
121121
source $<; \
122122
set +o allexport; \
123-
python3 "$(PACKAGES_DIR)/pytest-simcore/src/pytest_simcore/helpers/utils_docker_registry.py" $(DOWNLOADED_TEST_DATA_DIR)
123+
python3.10 "$(PACKAGES_DIR)/pytest-simcore/src/pytest_simcore/helpers/utils_docker_registry.py" $(DOWNLOADED_TEST_DATA_DIR)

services/api-server/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $(DOCKER_COMPOSE_EXTRA_FILE):
2323
db-tables: .env ## upgrades and create tables [for development]
2424
# Upgrading and creating tables
2525
export $(shell grep -v '^#' $< | xargs -d '\n'); \
26-
python3 tests/utils/init-pg.py
26+
python3.10 tests/utils/init-pg.py
2727

2828

2929

@@ -92,7 +92,7 @@ openapi.json: .env
9292
source .env; \
9393
set +o allexport; \
9494
export API_SERVER_DEV_FEATURES_ENABLED=0; \
95-
python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
95+
python3.10 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
9696

9797
# validates OAS file: $@
9898
@cd $(CURDIR); \

services/director/docker/boot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fi
3030
# RUNNING application ----------------------------------------
3131
if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then
3232
watchmedo auto-restart --recursive --pattern="*.py;*/src/*" --ignore-patterns="*test*;pytest_simcore/*;setup.py;*ignore*" --ignore-directories -- \
33-
python3 -m ptvsd --host 0.0.0.0 --port 3000 -m \
33+
python3.10 -m ptvsd --host 0.0.0.0 --port 3000 -m \
3434
simcore_service_director --loglevel="${LOGLEVEL}"
3535
else
3636
exec simcore-service-director --loglevel="${LOGLEVEL}"

services/director/docker/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fi
7171
if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]
7272
then
7373
# NOTE: production does NOT pre-installs ptvsd
74-
python3 -m pip install ptvsd
74+
python3.10 -m pip install ptvsd
7575
fi
7676

7777
# Appends docker group if socket is mounted

services/storage/docker/boot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ echo "$INFO" "Log-level app/server: $APP_LOG_LEVEL/$SERVER_LOG_LEVEL"
4141
if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then
4242
# NOTE: needs ptvsd installed
4343
echo "$INFO" "PTVSD Debugger initializing in port 3000 with ${SC_BUILD_TARGET}"
44-
eval "$entrypoint" python3 -m ptvsd --host 0.0.0.0 --port 3000 -m \
44+
eval "$entrypoint" python3.10 -m ptvsd --host 0.0.0.0 --port 3000 -m \
4545
simcore_service_storage run
4646
else
4747
exec simcore-service-storage run

0 commit comments

Comments
 (0)