From 52b38abf2a72976c12a041da43e81741d349e734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 9 Aug 2024 08:33:14 +0200 Subject: [PATCH] chore: cleanup and fix Dockerfile for development --- Dockerfile | 2 +- pyproject.toml | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b7c01b..8fd7552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ WORKDIR /app RUN groupadd -g 1000 www && useradd -u 1000 -ms /bin/bash -g www www # Only copy the requirements file first to leverage Docker cache -COPY $REQUIREMENTS_FILE . +COPY $REQUIREMENTS_FILE $REQUIREMENTS_FILE RUN mkdir -p /app/src/static && \ chown www:www /app/src/static && \ diff --git a/pyproject.toml b/pyproject.toml index a14bfbc..88e3fbc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,19 +12,19 @@ authors = [ { name = "Víðir Valberg Guðmundsson", email = "valberg@orn.li" }, ] dependencies = [ - "Django>=5.1b1,<5.2", - "django-money~=3.5", + "Django~=5.1", "django-allauth~=0.63", - "psycopg[binary]~=3.2", - "environs[django]>=11,<12", - "uvicorn~=0.30", - "whitenoise~=6.7", - "django-zen-queries~=2.1", + "django-money~=3.5", + "django-oauth-toolkit~=2.4", "django-registries==0.0.3", "django-view-decorator==0.0.4", - "django-oauth-toolkit~=2.4", + "django-zen-queries~=2.1", "django_stubs_ext~=5.0", + "environs[django]>=11,<12", + "psycopg[binary]~=3.2", "stripe~=10.5", + "uvicorn~=0.30", + "whitenoise~=6.7", ] version = "0.0.1" @@ -56,15 +56,12 @@ dependencies = [ [[tool.hatch.envs.tests.matrix]] python = ["3.12"] -django = ["5.1b1"] +django = ["5.1"] [tool.hatch.envs.tests.overrides] matrix.django.dependencies = [ { value = "django~={matrix:django}" }, ] -matrix.python.dependencies = [ - { value = "typing_extensions==4.5.0", if = ["3.10"]}, -] [tool.hatch.envs.default.scripts] cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=src --cov=tests --cov=append {args}"