Skip to content

Commit

Permalink
Update to py3.11. Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
eriktm committed Jan 6, 2024
1 parent 8e6c81b commit e1a8cc5
Show file tree
Hide file tree
Showing 9 changed files with 1,352 additions and 4,325 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Django CI

on:
push:
branches: [ "main" ]
branches: ["main"]
pull_request:
branches: [ "main" ]
branches: ["main"]

env:
PYTHON_VERSION: "3.10"
POETRY_VERSION: "1.3.2" # Remember to also update in pyproject.toml
POETRY_VERSION: "1.7.1" # Remember to also update in pyproject.toml
IMAGE_NAME: unicorn-backend

jobs:
Expand Down Expand Up @@ -51,17 +51,17 @@ jobs:
- name: Push image
run: |
IMAGE_ID=ghcr.io/${{ github.repository }}/$IMAGE_NAME
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "main" ] && VERSION=latest
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
docker tag image $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ARG WORKDIR="/app"

FROM python:3.10-alpine as base
FROM python:3.11-alpine as base

# Remember to also update in pyproject.toml
ENV POETRY_VERSION=1.6.1
ENV POETRY_VERSION=1.7.1

ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONFAULTHANDLER 1
Expand Down
1,091 changes: 539 additions & 552 deletions poetry.lock

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,37 @@ license = "MIT"
readme = "README.md"

[tool.poetry.dependencies]
python = "^3.10"
django = "~4.2.6"
python = "^3.11"
django = "~5.0.1"
djangorestframework = "~3.14.0"
django-cors-headers = "~4.2.0"
django-cors-headers = "~4.3.1"
django-debug-toolbar = "~4.2.0"
django-filter = "~23.3"
django-filter = "~23.5"
django-guardian = "~2.4.0"
djangorestframework-guardian = "==0.3.0"
django-oauth-toolkit = "~2.3.0"
drf-writable-nested = "==0.7.0"
gunicorn = "~21.2.0"
pytz = ">=2023.3,<2024.0"
python-dateutil = ">=2.8.2,<3.0"
social-auth-app-django = "^5.3.0"
social-auth-app-django = "^5.4.0"
django-environ = "~0.11.2"
django-tailwind = "==3.4.0"
drf-spectacular = "~0.26.5"
django-tailwind = "==3.8.0"
drf-spectacular = "~0.27.0"
django-redis = "~5.4.0"
pillow = "^10.0.1"
pillow = "^10.2.0"
django-auditlog = "~2.3.0"
psycopg = {extras = ["binary"], version = "^3.1.12"}
psycopg = {extras = ["binary"], version = "^3.1.16"}


[tool.poetry.group.dev.dependencies]
flake8 = "^6.1.0"
unittest2 = "^1.1.0"
black = "^23.9.1"
black = "^23.12.1"

[build-system]
# Remember to also update in Dockerfile and Github Workflow
requires = ["poetry-core==1.6.1"]
requires = ["poetry-core==1.7.1"]
build-backend = "poetry.core.masonry.api"

[tool.isort]
Expand Down
2 changes: 1 addition & 1 deletion unicorn/theme/static/css/dist/styles.css

Large diffs are not rendered by default.

27 changes: 0 additions & 27 deletions unicorn/theme/static_src/bs.config.js

This file was deleted.

Loading

0 comments on commit e1a8cc5

Please sign in to comment.