From ac3e1f15ff67ee05cfca3268bbc3a53213dc1098 Mon Sep 17 00:00:00 2001 From: Benjamin Forehand Jr Date: Tue, 7 Jan 2025 12:20:40 -0600 Subject: [PATCH] fix SYNC-4567: Pin poetry and update makefile to use new commands. --- .circleci/config.yml | 4 ++-- Makefile | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 908349ba..0e3db249 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,7 +107,7 @@ commands: name: Set up Python command: | pip install --upgrade pip - pip install poetry + pip install poetry==2.0.0 jobs: audit: @@ -147,7 +147,7 @@ jobs: name: Set up Python command: | pip install --upgrade pip - pip install poetry + pip install poetry==2.0.0 - run: name: isort, black, flake8, pydocstyle and mypy command: make lint diff --git a/Makefile b/Makefile index d93c336d..b467fe2d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ INTEGRATION_TEST_DIR := $(TESTS_DIR)/integration INTEGRATION_TEST_FILE := $(INTEGRATION_TEST_DIR)/test_integration_all_rust.py NOTIFICATION_TEST_DIR := $(TESTS_DIR)/notification LOAD_TEST_DIR := $(TESTS_DIR)/load -POETRY := poetry --directory $(TESTS_DIR) +POETRY := poetry --project $(TESTS_DIR) DOCKER_COMPOSE := docker compose PYPROJECT_TOML := $(TESTS_DIR)/pyproject.toml POETRY_LOCK := $(TESTS_DIR)/poetry.lock @@ -23,6 +23,9 @@ $(INSTALL_STAMP): $(PYPROJECT_TOML) $(POETRY_LOCK) $(POETRY) install touch $(INSTALL_STAMP) +install_poetry: + curl -sSL https://install.python-poetry.org | python3 - --version 2.0.0 + upgrade: $(CARGO) install cargo-edit || echo "\n$(CARGO) install cargo-edit failed, continuing.."