Skip to content

Commit

Permalink
py312 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
adRn-s committed Oct 24, 2024
1 parent eb859c6 commit 734a166
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ repos:
rev: v0.7.0
hooks:
- id: ruff-format
args: [--target-version, py311] # 3.11
args: [--target-version, py312] # 3.12
# - repo: https://github.com/dosisod/refurb
# rev: v2.0.0
# hooks:
# - id: refurb
# args: [--python-version, "3.11", --sort, error] #, --format, gitub
# args: [--python-version, "3.12", --sort, error] #, --format, gitub
- repo: https://github.com/asottile/pyupgrade
rev: v3.17.0
hooks:
- id: pyupgrade
args: [--py311-plus] # 3.11
args: [--py312-plus] # 3.12
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.21.0
hooks:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
??.??.??
========

- Reintroduced CI jobs for Python 3.12, and we have also added support for Python 3.13.
- We're now running on Python 3.12 (its CI jobs were reintroduced), and we have also added support for Python 3.13.
- We have switched over to `uv` everywhere (Makefile, Docker, CI) instead of plain `pip-tools`.
- Replaced `isort` and `black` with `ruff` (CI).
- Added history tracking to the `Duty` model.
Expand All @@ -15,7 +15,7 @@
========

- E-mail communications: grayed-out "send" button after 1 click, to avoid spamming inboxes.
- Fixtures: save_initial_data management cmd will use built-in json formatter instead of `jq`.
- Fixtures: `save_initial_data` management command will now be using the built-in json formatter instead of `jq`.
- Updated clipboard functionality at Incoming submodule.
- Updated organisms names on both production database and fixtures.
- Updated dependencies.
Expand Down
7 changes: 5 additions & 2 deletions backend.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PyVersion=3.11 # to be repeated after FROM, docker syntax is at fault.
ARG PyVersion=3.12 # to be repeated after FROM, docker syntax is at fault.
FROM python:${PyVersion}-bullseye AS pk2_base
ARG PyVersion=3.11
ARG PyVersion=3.12
COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv

ENV \
Expand All @@ -27,6 +27,9 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8

WORKDIR /usr/src/app

## Pre-heat the cache
RUN --mount=type=cache,target=/root/.cache/uv \
uv pip install setuptools wheel psycopg2 gunicorn django~=4.2
## First, bring dependencies specification and install them
COPY ./backend/requirements requirements
RUN --mount=type=cache,target=/root/.cache/uv \
Expand Down

0 comments on commit 734a166

Please sign in to comment.