Skip to content

Commit

Permalink
upgrade poetry and cryptography (#2115)
Browse files Browse the repository at this point in the history
Co-authored-by: William B <[email protected]>
  • Loading branch information
sastels and whabanks authored Feb 22, 2024
1 parent 750c21a commit 098df03
Show file tree
Hide file tree
Showing 10 changed files with 230 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.10@sha256:ef9cc483a593c95

ARG KUBENS_VERSION="0.9.4"
ARG OCTANT_VERSION="0.25.1"
ENV POETRY_VERSION="1.3.2"
ENV POETRY_VERSION="1.7.1"

# Install packages
RUN apt-get update \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
${{ runner.os }}-pip-
- name: Install poetry
env:
POETRY_VERSION: "1.3.2"
POETRY_VERSION: "1.7.1"
run: pip install poetry==${POETRY_VERSION} && poetry --version
- name: Check poetry.lock aligns with pyproject.toml
run: poetry lock --check
run: poetry check --lock
- name: Install requirements
run: poetry install --with test
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ freeze-requirements:

.PHONY: test-requirements
test-requirements:
poetry lock --check
poetry check --lock

.PHONY: coverage
coverage: venv ## Create coverage report
Expand Down
3 changes: 1 addition & 2 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
FROM python:3.10-alpine3.16@sha256:afe68972cc00883d70b3760ee0ffbb7375cf09706c122dda7063ffe64c5be21b

ENV PYTHONDONTWRITEBYTECODE 1
ENV POETRY_VERSION "1.3.2"
ENV APP_VENV="/app/.venv"
ENV POETRY_HOME="/opt/poetry"
ENV POETRY_VERSION="1.3.2"
ENV POETRY_VERSION="1.7.1"
ENV POETRY_VIRTUALENVS_CREATE="false"
ENV PATH="${APP_VENV}/bin:${POETRY_HOME}/bin:$PATH"

Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.lambda
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV PYTHONDONTWRITEBYTECODE 1
ENV TASK_ROOT /app
ENV APP_VENV="${TASK_ROOT}/.venv"
ENV POETRY_HOME="/opt/poetry"
ENV POETRY_VERSION="1.3.2"
ENV POETRY_VERSION="1.7.1"
ENV POETRY_VIRTUALENVS_CREATE="false"
ENV PATH="${APP_VENV}/bin:${POETRY_HOME}/bin:$PATH"

Expand Down
4 changes: 2 additions & 2 deletions ci/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
FROM python:3.10-alpine@sha256:860f632e67178d9e90c7dfa9844a5e02098220bff5716d3c2fe1870325f00853

ENV PYTHONDONTWRITEBYTECODE 1
ENV POETRY_VERSION "1.3.2"
ENV POETRY_VERSION "1.7.1"
ARG APP_VENV="/app/.venv"
ARG POETRY_HOME="/opt/poetry"
ARG POETRY_VERSION="1.3.2"
ARG POETRY_VERSION="1.7.1"
ARG POETRY_VIRTUALENVS_CREATE="false"
ENV PATH="${APP_VENV}/bin:${POETRY_HOME}/bin:$PATH"

Expand Down
2 changes: 1 addition & 1 deletion local/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.10-alpine@sha256:860f632e67178d9e90c7dfa9844a5e02098220bff5716d3c2fe1870325f00853

ENV PYTHONDONTWRITEBYTECODE 1
ENV POETRY_VERSION "1.3.2"
ENV POETRY_VERSION "1.7.1"

RUN apk add --no-cache bash build-base git gcc musl-dev postgresql-dev g++ make libffi-dev libmagic libcurl curl-dev && rm -rf /var/cache/apk/*

Expand Down
Loading

0 comments on commit 098df03

Please sign in to comment.