Skip to content

Commit

Permalink
fix SYNC-4567: Pin poetry and update makefile to use new commands. (#817
Browse files Browse the repository at this point in the history
)

This pins poetry on CI to use version 2.0.0 and updates our make file to
make use of the `--project` flag. I also added a make command to install
the pinned version.
  • Loading branch information
b4handjr authored Jan 13, 2025
2 parents a6fc8cd + a3a6d33 commit 2f83c7c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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
Expand All @@ -26,6 +26,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.."
Expand Down

0 comments on commit 2f83c7c

Please sign in to comment.