Skip to content

Build AI methods with your coding agent, then run them anywhere: as an MCP for chatbots, as a webapp for people, or via API for your software.

Fix/makefile python version (#30)

Thomas Hebrard3a34c611308e
diff --git a/.github/workflows/tests-check.yml b/.github/workflows/tests-check.yml
index 0866952f6..53cda9760 100644
--- a/.github/workflows/tests-check.yml
+++ b/.github/workflows/tests-check.yml
@@ -21,9 +21,6 @@ jobs:
env:
VIRTUAL_ENV: ${{ github.workspace }}/.venv
ENV: dev
- GOOGLE_ENCRYPTED_CREDENTIALS_KEY: ${{ secrets.GOOGLE_ENCRYPTED_CREDENTIALS_KEY }}
- GOOGLE_ENCRYPTED_CREDENTIALS_PATH: ${{ secrets.GOOGLE_ENCRYPTED_CREDENTIALS_PATH }}
- COLUMNS: 120
steps:
- uses: actions/checkout@v4
@@ -32,23 +29,6 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- - name: "Authenticate to Google Cloud"
- uses: "google-github-actions/auth@v1"
- with:
- workload_identity_provider: "projects/634168471546/locations/global/workloadIdentityPools/github-wif/providers/githuboidc"
- service_account: "[email protected]"
-
- - name: "Get secret from Secret Manager"
- id: get_secret
- uses: "google-github-actions/get-secretmanager-secrets@v2"
- with:
- secrets: |-
- GOOGLE_ENCRYPTED_CREDENTIALS:projects/634168471546/secrets/GOOGLE_ENCRYPTED_CREDENTIALS/versions/1
-
- - name: "Create encrypted_credentials.txt file"
- run: |
- echo "${{ steps.get_secret.outputs.GOOGLE_ENCRYPTED_CREDENTIALS }}" > encrypted_credentials.txt
-
- name: Check UV installation
run: make check-uv
diff --git a/Makefile b/Makefile
index 0419eba6b..6b34738f3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,9 @@ endif
VIRTUAL_ENV := $(CURDIR)/.venv
PROJECT_NAME := $(shell grep '^name = ' pyproject.toml | sed -E 's/name = "(.*)"/\1/')
+# The "?" is used to make the variable optional, so that it can be overridden by the user.
PYTHON_VERSION ?= 3.11
-VENV_PYTHON := $(VIRTUAL_ENV)/bin/python$(PYTHON_VERSION)
+VENV_PYTHON := $(VIRTUAL_ENV)/bin/python
VENV_PYTEST := $(VIRTUAL_ENV)/bin/pytest
VENV_RUFF := $(VIRTUAL_ENV)/bin/ruff
VENV_PYRIGHT := $(VIRTUAL_ENV)/bin/pyright
@@ -83,7 +84,16 @@ make fix-unused-imports - Fix unused imports with ruff
endef
export HELP
-.PHONY: all help env lock install update format lint pyright mypy build cleanderived cleanenv validate v gha-tests test test-with-prints t test-inference ti test-imgg tg test-ocr to check cc li merge-check-ruff-lint merge-check-ruff-format merge-check-mypy check-unused-imports fix-unused-imports test-name check-uv
+.PHONY: \
+ all help env lock install update build \
+ format lint pyright mypy \
+ cleanderived cleanenv cleanlibraries cleanall \
+ test test-with-prints t test-inference ti \
+ test-imgg tg test-ocr to codex-tests gha-tests \
+ run-all-tests run-manual-trigger-gha-tests run-gha_disabled-tests \
+ validate v check c cc \
+ merge-check-ruff-lint merge-check-ruff-format merge-check-mypy merge-check-pyright \
+ li check-unused-imports fix-unused-imports check-uv check-TODOs
all help:
@echo "$$HELP"
@@ -101,8 +111,6 @@ check-uv:
}
@uv self update >/dev/null 2>&1 || true
-CURRENT_VERSION := $(shell grep '^version = ' pyproject.toml | sed -E 's/version = "(.*)"/\1/')
-NEXT_VERSION := $(shell echo $(CURRENT_VERSION) | awk -F. '{$$NF = $$NF + 1;} 1' | sed 's/ /./g')
env: check-uv
$(call PRINT_TITLE,"Creating virtual environment")
@@ -112,7 +120,7 @@ env: check-uv
else \
echo "Python virtual env already exists in \`${VIRTUAL_ENV}\`"; \
fi
- @echo "Using Python: $$($(VIRTUAL_ENV)/bin/python3 --version) from $$(which $$(readlink -f $(VIRTUAL_ENV)/bin/python3))"
+ @echo "Using Python: $$($(VENV_PYTHON) --version) from $$(which $$(readlink -f $(VENV_PYTHON)))"
init: env
$(call PRINT_TITLE,"Running pipelex init")
diff --git a/uv.lock b/uv.lock
index 30400d667..36c14e9f2 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1195,7 +1195,7 @@ wheels = [
[[package]]
name = "pipelex"
-version = "0.2.9"
+version = "0.2.10"
source = { editable = "." }
dependencies = [
{ name = "aiofiles" },