From f63d265c688ada4c405c9c458dbd0a05fdb91033 Mon Sep 17 00:00:00 2001 From: Colin Goutte on Zotac-Manjaro-Arcole Date: Thu, 6 Mar 2025 16:32:52 +0100 Subject: [PATCH] Proxy poetry use with venv --- Makefile | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 5bbc924..6081cef 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,48 @@ +system_minor := $(shell python3 -c "import sys;print(sys.version_info.minor)") +minor?=$(system_minor) +minor=9 +PYTHON=python3.$(minor) +venv=.venv3.$(minor) +PYTHON_INTERPRETER=python3 + +NOLINK_PATH=$(venv) +VENV_PATH=.venv +VENV_BIN=$(VENV_PATH)/bin + +PIP=$(VENV_BIN)/pip +POETRY=$(VENV_BIN)/poetry + + + + +.venv3.$(minor): + $(PYTHON) -m venv $(venv) + $(NOLINK_PATH)/bin/python -m ensurepip + + +venv: + touch .env + make .venv3.$(minor) + rm -f .venv && ln -s $(venv) ./.venv + $(PIP) install --upgrade pip + $(PIP) install --upgrade setuptools + +dep_poetry: venv + $(PIP) install poetry -dep_poetry: - pip install --user poetry .ONESHELL: install: dep_poetry - poetry install + $(POETRY) install scaledev: - poetry run uvicorn papi.main:app --reload --port 9000 + $(POETRY) run uvicorn papi.main:app --reload --port 9000 .ONESHELL: serve: - poetry run uvicorn papi.main:app + $(POETRY) run uvicorn papi.main:app kill_server: pgrep -f papi.*python | xargs kill -9 @@ -21,7 +50,7 @@ kill_server: .ONESHELL: dev_serve: PAPI_NOMAIL=TRUE \ - poetry run uvicorn papi.main:app --reload + $(POETRY) run uvicorn papi.main:app --reload cleandb: @@ -29,14 +58,14 @@ cleandb: .ONESHELL: test: cleandb - poetry run pytest --cov=. --cov-report=term-missing:skip-covered . + $(POETRY) run pytest --cov=. --cov-report=term-missing:skip-covered . .ONESHELL: dtest: cleandb - poetry run pytest -s --ff --lf --pdb --cov=. --cov-report=term-missing:skip-covered . + $(POETRY) run pytest -s --ff --lf --pdb --cov=. --cov-report=term-missing:skip-covered . .ONESHELL: qtest: cleandb - poetry run pytest -sxv --ff --lf . + $(POETRY) run pytest -sxv --ff --lf .