From 111a6296d4073563a2107aab9da1146d5ec24063 Mon Sep 17 00:00:00 2001 From: Peter Law Date: Wed, 7 Sep 2022 15:05:27 +0100 Subject: [PATCH 1/4] Install poetry from the new recommended source --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8cd4ead..3cbba08 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ references: run: name: Install Poetry command: | - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python + curl -sSL https://install.python-poetry.org/ | python3 restore-dependencies-cache: &restore-dependencies-cache restore_cache: keys: From 7434fc6aad7ff36f46dab995983c030cb62a6de8 Mon Sep 17 00:00:00 2001 From: Peter Law Date: Wed, 7 Sep 2022 15:11:19 +0100 Subject: [PATCH 2/4] Use exact invocation from poetry docs --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3cbba08..a55c70b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ references: run: name: Install Poetry command: | - curl -sSL https://install.python-poetry.org/ | python3 + curl -sSL https://install.python-poetry.org | python3 - restore-dependencies-cache: &restore-dependencies-cache restore_cache: keys: From 7371f330c066db33a4c6072b14b9442901d627e9 Mon Sep 17 00:00:00 2001 From: Peter Law Date: Wed, 7 Sep 2022 15:16:17 +0100 Subject: [PATCH 3/4] Pin version for Python 3.6 support Poetry 1.2.x drops support for Python 3.7 --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a55c70b..a94a98f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,8 @@ references: run: name: Install Poetry command: | - curl -sSL https://install.python-poetry.org | python3 - + # Need to use version < 1.2.0 in order to support Python 3.6 + curl -sSL https://install.python-poetry.org | python3 - --version 1.1.15 restore-dependencies-cache: &restore-dependencies-cache restore_cache: keys: From 703ecc0cc898ef38d65a18f8d227aa359bc3f9f0 Mon Sep 17 00:00:00 2001 From: Peter Law Date: Wed, 7 Sep 2022 15:24:22 +0100 Subject: [PATCH 4/4] Remove poetry env sourcing that maybe isn't needed? --- .circleci/config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a94a98f..74dae0f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,6 @@ references: run: name: Install Dependencies command: | - source $HOME/.poetry/env poetry install poetry run pip install "django~=<< parameters.django-version >>.0" save-dependencies-cache: &save-dependencies-cache @@ -66,7 +65,6 @@ jobs: - run: name: Run Tests command: | - source $HOME/.poetry/env poetry run ./runtests lint: @@ -83,7 +81,6 @@ jobs: - run: name: Run Flake8 command: | - source $HOME/.poetry/env poetry run flake8 type-check: @@ -100,7 +97,6 @@ jobs: - run: name: Run Mypy command: | - source $HOME/.poetry/env poetry run ./script/type-check deploy: @@ -113,7 +109,6 @@ jobs: - run: name: Push to PyPI command: | - source $HOME/.poetry/env poetry publish \ --build \ --username "${PYPI_USERNAME}" \