From 7d23711873fd74e62d72a82c41d5244ecb80a3d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 09:44:54 +0000 Subject: [PATCH 1/2] chore: bump epam/ai-dial-ci from 1.10.2 to 1.11.0 Bumps [epam/ai-dial-ci](https://github.com/epam/ai-dial-ci) from 1.10.2 to 1.11.0. - [Release notes](https://github.com/epam/ai-dial-ci/releases) - [Commits](https://github.com/epam/ai-dial-ci/compare/1.10.2...1.11.0) --- updated-dependencies: - dependency-name: epam/ai-dial-ci dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy_dev.yml | 2 +- .github/workflows/e2e_tests.yml | 2 +- .github/workflows/pr-title-check.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 7491113..fcd8106 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -6,7 +6,7 @@ on: jobs: gitlab-dev-deploy: if: ${{ github.event.registry_package.package_version.container_metadata.tag.name == 'development' }} - uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.10.2 + uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.11.0 with: gitlab-project-id: "1823" gitlab-project-ref: "master" diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml index d22f5a0..21cf531 100644 --- a/.github/workflows/e2e_tests.yml +++ b/.github/workflows/e2e_tests.yml @@ -6,7 +6,7 @@ on: jobs: e2e-tests: if: ${{ github.event.registry_package.package_version.container_metadata.tag.name == 'development' }} - uses: epam/ai-dial-ci/.github/workflows/e2e-test.yml@1.10.2 + uses: epam/ai-dial-ci/.github/workflows/e2e-test.yml@1.11.0 with: gitlab-project-id: "1843" secrets: diff --git a/.github/workflows/pr-title-check.yml b/.github/workflows/pr-title-check.yml index b9e3daf..4d99ccf 100644 --- a/.github/workflows/pr-title-check.yml +++ b/.github/workflows/pr-title-check.yml @@ -9,6 +9,6 @@ on: jobs: pr-title-check: - uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.10.2 + uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.11.0 secrets: ACTIONS_BOT_TOKEN: ${{ secrets.ACTIONS_BOT_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 468fe00..eef996b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,5 +6,5 @@ on: jobs: run_tests: - uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.10.2 + uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.11.0 secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca3b29b..9b54f88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,5 +6,5 @@ on: jobs: release: - uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.10.2 + uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.11.0 secrets: inherit From e9bee447b27102d513b2502c08654c360d19f1aa Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Thu, 16 Jan 2025 17:26:04 +0000 Subject: [PATCH 2/2] fix: replace VENV -> VENV_DIR --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 3d67400..e57d088 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,8 @@ IMAGE_NAME ?= ai-dial-adapter-vertexai PLATFORM ?= linux/amd64 DEV_PYTHON ?= 3.11 DOCKER ?= docker -VENV ?= .venv -POETRY ?= ${VENV}/bin/poetry +VENV_DIR ?= .venv +POETRY ?= $(VENV_DIR)/bin/poetry POETRY_VERSION ?= 1.8.5 ARGS= @@ -13,36 +13,36 @@ ARGS= all: build init_env: - python -m venv ${VENV} - ${VENV}/bin/pip install poetry==${POETRY_VERSION} --quiet + python -m venv $(VENV_DIR) + $(VENV_DIR)/bin/pip install poetry==$(POETRY_VERSION) --quiet install: init_env - ${POETRY} env use python$(DEV_PYTHON) - ${POETRY} install + $(POETRY) env use python$(DEV_PYTHON) + $(POETRY) install build: install - ${POETRY} build + $(POETRY) build serve: install - ${POETRY} run uvicorn "aidial_adapter_vertexai.app:app" \ + $(POETRY) run uvicorn "aidial_adapter_vertexai.app:app" \ --reload --host "0.0.0.0" --port $(PORT) \ --workers=1 --env-file ./.env clean: - ${POETRY} run python -m scripts.clean - ${POETRY} env remove --all + $(POETRY) run python -m scripts.clean + $(POETRY) env remove --all lint: install - ${POETRY} run nox -s lint + $(POETRY) run nox -s lint format: install - ${POETRY} run nox -s format + $(POETRY) run nox -s format test: install - ${POETRY} run nox -s test + $(POETRY) run nox -s test integration_tests: install - ${POETRY} run nox -s integration_tests + $(POETRY) run nox -s integration_tests docker_test: $(DOCKER) build --platform $(PLATFORM) -f Dockerfile.test -t $(IMAGE_NAME):test .