Skip to content

Commit

Permalink
Align versions of Python@3.10.9 and Poetry@1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
grahamalama committed Jan 26, 2023
1 parent b037a13 commit d38d032
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 146 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install poetry
run: pipx install poetry
run: pipx install poetry==1.3.2
- uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.10.9"
cache: "poetry"
- name: Install dependencies
run: poetry install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install poetry
run: pipx install poetry
run: pipx install poetry==1.3.2
- uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.10.9"
cache: "poetry"
- name: Install dependencies
run: poetry install
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.6 as python-base
FROM python:3.10.9 as python-base

ENV PIP_DEFAULT_TIMEOUT=100 \
PIP_DISABLE_PIP_VERSION_CHECK=on \
Expand All @@ -9,14 +9,14 @@ ENV PIP_DEFAULT_TIMEOUT=100 \
PYSETUP_PATH="/opt/pysetup"

RUN python3 -m venv $POETRY_HOME && \
$POETRY_HOME/bin/pip install poetry==1.3.1 && \
$POETRY_HOME/bin/poetry --version
$POETRY_HOME/bin/pip install poetry==1.3.2 && \
$POETRY_HOME/bin/poetry --version

WORKDIR $PYSETUP_PATH
COPY ./poetry.lock ./pyproject.toml ./
RUN $POETRY_HOME/bin/poetry install --no-dev --no-root

FROM python:3.10.6-slim as production
FROM python:3.10.9-slim as production

COPY bin/update_and_install_system_packages.sh /opt
RUN opt/update_and_install_system_packages.sh libpq5
Expand Down
138 changes: 2 additions & 136 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ authors = ["CTMS Reviewers <@mozilla-it/ctms-reviewers>"]

[tool.poetry.dependencies]
# These packages are mandatory and form the core of this package’s distribution.
python = ">=3.7, <3.11"
python = "3.10.9"
fastapi = "^0.84.0"
starlette = "^0.19.1"
requests = "^2.28.1"
Expand Down Expand Up @@ -120,7 +120,7 @@ profile = "black"

[tool.mypy]
# Sync Python version with Dockerfile
python_version = "3.10"
python_version = "3.10.9"
# Look for errors in this file
warn_unused_configs = true

Expand Down

0 comments on commit d38d032

Please sign in to comment.