From ced33ddfb46adfa78fe3c2fa739e811c6dda86fd Mon Sep 17 00:00:00 2001 From: KaySar12 Date: Wed, 21 May 2025 09:11:01 +0700 Subject: [PATCH] chore: update .gitignore and adjust Makefile for new Python interpreter --- .gitignore | 4 ++-- Makefile | 3 ++- extra-addons | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fb43d3e3e..a064b67f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# sphinx build directories +l# sphinx build directories _build/ # dotfiles @@ -49,4 +49,4 @@ package.json /man/ /share/ /src/ -/venv/ +/venv*/ diff --git a/Makefile b/Makefile index 0e095cf2b..514fe8c3a 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ UID = $(shell id -u) GID = $(shell id -g) PIP=${PWD}/venv/bin/pip PYTHON=${PWD}/venv/bin/python +PYTHON_INTERPRETER=${PWD}/venv-interpreter/bin/python VENV := $(shell [ -d "${PWD}/venv" ] && echo "exists" || echo "missing") DOCKERCMD=docker DOCKER_COMPOSE_CMD=docker-compose @@ -36,7 +37,7 @@ BACKUP=${CDN}/raw/branch/main/backup/${VERSION}/odoo18-main_2025-01-15_08-05-47. AUTOMATION_PATH=${PWD}/automation UPGRADE_SCRIPTS=$(shell cat upgrade_scripts | tr '\n' ',') push_code: - $(PYTHON) ${SCRIPT_PATH}/interpreter/gen_commit.py $(GIT_USER) $(GIT_PASS) $(PWD) + $(PYTHON_INTERPRETER) ${SCRIPT_PATH}/interpreter/gen_commit.py $(GIT_USER) $(GIT_PASS) $(PWD) ##### Virtual Environment ##### check-virtualenv: @if [ "$(VENV)" = "missing" ]; then \ diff --git a/extra-addons b/extra-addons index a3540e05c..d1a369edd 160000 --- a/extra-addons +++ b/extra-addons @@ -1 +1 @@ -Subproject commit a3540e05c33b19bd1d16a50d38ebf0942e69b497 +Subproject commit d1a369eddc22bd0ca5c65f54efd33a403b232f78