aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Chris <[email protected]>2021-05-17 18:05:28 +0100
committerGravatar Chris <[email protected]>2021-05-17 18:05:28 +0100
commitb0308d9e4b79052dd8e5acae0155309f7dbd5419 (patch)
tree62b86dccf1f158f85e3664ffbd9c82a33c5fe77c
parentConvert docker file to use 3.9 and poetry (diff)
Bump lint flow to 3.9 and use poetry
-rw-r--r--.github/workflows/lint-test.yaml19
1 files changed, 8 insertions, 11 deletions
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 9e3d331d..f97cd758 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -15,15 +15,12 @@ jobs:
PIP_NO_CACHE_DIR: false
PIP_USER: 1
- # Hide the graphical elements from pipenv's output
- PIPENV_HIDE_EMOJIS: 1
- PIPENV_NOSPIN: 1
-
- # Make sure pipenv does not try reuse an environment it's running in
- PIPENV_IGNORE_VIRTUALENVS: 1
+ # Make sure package manager does not use virtualenv
+ POETRY_VIRTUALENVS_CREATE: false
# Specify explicit paths for python dependencies and the pre-commit
# environment so we know which directories to cache
+ POETRY_CACHE_DIR: ${{ github.workspace }}/.cache/py-user-base
PYTHONUSERBASE: ${{ github.workspace }}/.cache/py-user-base
PRE_COMMIT_HOME: ${{ github.workspace }}/.cache/pre-commit-cache
@@ -38,7 +35,7 @@ jobs:
id: python
uses: actions/setup-python@v2
with:
- python-version: '3.8'
+ python-version: '3.9'
# Start the database early to give it a chance to get ready before
# we start running tests.
@@ -58,14 +55,14 @@ jobs:
path: ${{ env.PYTHONUSERBASE }}
key: "python-0-${{ runner.os }}-${{ env.PYTHONUSERBASE }}-\
${{ steps.python.outputs.python-version }}-\
- ${{ hashFiles('./Pipfile', './Pipfile.lock') }}"
+ ${{ hashFiles('./pyproject.toml', './poetry.lock') }}"
# Install our dependencies if we did not restore a dependency cache
- - name: Install dependencies using pipenv
+ - name: Install dependencies using poetry
if: steps.python_cache.outputs.cache-hit != 'true'
run: |
- pip install pipenv
- pipenv install --dev --deploy --system
+ pip install poetry
+ poetry install
# This step caches our pre-commit environment. To make sure we
# do create a new environment when our pre-commit setup changes,