diff --git a/Dockerfile b/Dockerfile index 6e76e1c..e1b89ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim +FROM python:3.11-slim WORKDIR /srv/app diff --git a/dev-requirements.txt b/dev-requirements.txt index 3bb39f2..e69de29 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,138 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --extra=dev --output-file=dev-requirements.txt pyproject.toml -# -asgiref==3.6.0 - # via django -attrs==22.2.0 - # via pytest -black==23.3.0 - # via pytest-black -build==0.10.0 - # via pip-tools -chardet==4.0.0 - # via diff-cover - # via flake8-black -build==0.10.0 - # via pip-tools - # via pytest-black -chardet==4.0.0 - # via diff-cover -click==8.1.3 - # via - # black - # pip-tools -coverage[toml]==7.2.2 - # via pytest-cov -diff-cover==4.2.3 - # via la-chariotte (pyproject.toml) -django==4.2 - # via la-chariotte (pyproject.toml) -exceptiongroup==1.1.1 - # via pytest -importlib-metadata==6.1.0 - # via inflect -inflect==3.0.2 - # via - # diff-cover - # jinja2-pluralize -flake8==6.0.0 - # via flake8-black -flake8-black==0.3.6 - # via la-chariotte (pyproject.toml) -importlib-metadata==6.1.0 - # via inflect -inflect==3.0.2 - # via - # diff-cover - # jinja2-pluralize -iniconfig==2.0.0 - # via pytest -isort==5.12.0 - # via pytest-isort -jinja2==3.1.2 - # via - # diff-cover - # jinja2-pluralize -jinja2-pluralize==0.3.0 - # via diff-cover -markupsafe==2.1.2 - # via jinja2 -mccabe==0.7.0 - # via flake8 -mypy-extensions==1.0.0 - # via black -packaging==23.0 - # via - # black - # build - # pytest -pathspec==0.11.1 - # via black -pip-tools==6.12.3 - # via la-chariotte (pyproject.toml) -platformdirs==3.2.0 - # via black -pluggy==1.0.0 - # via - # diff-cover - # pytest -psycopg2-binary==2.9.6 - # via la-chariotte (pyproject.toml) -pygments==2.14.0 - # via diff-cover - # via la-chariotte (pyproject.toml) -pycodestyle==2.10.0 - # via flake8 -pyflakes==3.0.1 - # via flake8 -pygments==2.14.0 - # via diff-cover -pyproject-hooks==1.0.0 - # via build -pytest==7.2.2 - # via - # la-chariotte (pyproject.toml) - # pytest-black - # pytest-cov - # pytest-django - # pytest-isort -pytest-black==0.3.12 - # via la-chariotte (pyproject.toml) -pytest-cov==4.0.0 - # via la-chariotte (pyproject.toml) -pytest-django==4.5.2 - # via la-chariotte (pyproject.toml) -pytest-isort==3.1.0 - # via la-chariotte (pyproject.toml) -sqlparse==0.4.3 - # via django -toml==0.10.2 - # via pytest-black -tomli==2.0.1 - # via - # black - # build - # coverage - # pyproject-hooks - # pytest -wheel==0.40.0 - # via pip-tools -zipp==3.15.0 - # via importlib-metadata - # coverage - # flake8-black - # pyproject-hooks - # pytest -wheel==0.40.0 - # via pip-tools -zipp==3.15.0 - # via importlib-metadata -xhtml2pdf==0.2.11 - # à la main : il faudrait l'ajouter dans le pyproject - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/la_chariotte/settings.py b/la_chariotte/settings.py index 12956be..dd261bd 100644 --- a/la_chariotte/settings.py +++ b/la_chariotte/settings.py @@ -24,10 +24,12 @@ BASE_URL = os.getenv("BASE_URL", "http://127.0.0.1:8000") # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.geteng("SECRET_KEY", "django-insecure-f66vu+dj79c(5u(w2i0indkrlf$qtt!b$dmotnm%5!0a*9+=my") +SECRET_KEY = os.getenv( + "SECRET_KEY", "django-insecure-f66vu+dj79c(5u(w2i0indkrlf$qtt!b$dmotnm%5!0a*9+=my" +) # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = os.getenv(DEBUG, "True") == "True" +DEBUG = os.getenv("DEBUG", "True") == "True" ALLOWED_HOSTS = ["localhost", "127.0.0.1"] if os.getenv("ALLOWED_HOSTS"): diff --git a/pyproject.toml b/pyproject.toml index 243d912..211d44f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,7 @@ dependencies = [ "django>=4,<5", "psycopg2-binary>=2,<3", "sentry-sdk<1", + "xhtml2pdf", ] [build-system] @@ -27,7 +28,6 @@ dev = [ "pytest-cov>=4,<5", "diff-cover>=4,<5", "pytest-black<1", - # il faudrait ajouter xhtml2pdf, mais la génération des requirements ne marche pas ] [tool.pytest.ini_options] diff --git a/requirements.txt b/requirements.txt index 649a9d7..4a94e9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,17 +4,101 @@ # # pip-compile # +arabic-reshaper==3.0.0 + # via xhtml2pdf asgiref==3.7.2 # via django +asn1crypto==1.5.1 + # via + # oscrypto + # pyhanko + # pyhanko-certvalidator certifi==2023.5.7 - # via sentry-sdk + # via + # requests + # sentry-sdk +cffi==1.15.1 + # via cryptography +charset-normalizer==3.1.0 + # via requests +click==8.1.3 + # via pyhanko +cryptography==40.0.2 + # via + # pyhanko + # pyhanko-certvalidator +cssselect2==0.7.0 + # via svglib django==4.2.1 # via la-chariotte (pyproject.toml) +html5lib==1.1 + # via xhtml2pdf +idna==3.4 + # via requests +lxml==4.9.2 + # via svglib +oscrypto==1.3.0 + # via pyhanko-certvalidator +pillow==9.5.0 + # via + # reportlab + # xhtml2pdf psycopg2-binary==2.9.6 # via la-chariotte (pyproject.toml) +pycparser==2.21 + # via cffi +pyhanko==0.18.1 + # via xhtml2pdf +pyhanko-certvalidator==0.22.0 + # via + # pyhanko + # xhtml2pdf +pypdf==3.9.0 + # via xhtml2pdf +pypng==0.20220715.0 + # via qrcode +python-bidi==0.4.2 + # via xhtml2pdf +pyyaml==6.0 + # via pyhanko +qrcode==7.4.2 + # via pyhanko +reportlab==3.6.13 + # via + # svglib + # xhtml2pdf +requests==2.31.0 + # via + # pyhanko + # pyhanko-certvalidator sentry-sdk==0.20.3 # via la-chariotte (pyproject.toml) +six==1.16.0 + # via + # html5lib + # python-bidi sqlparse==0.4.4 # via django +svglib==1.5.1 + # via xhtml2pdf +tinycss2==1.2.1 + # via + # cssselect2 + # svglib +typing-extensions==4.6.2 + # via qrcode +tzlocal==5.0.1 + # via pyhanko +uritools==4.0.1 + # via pyhanko-certvalidator urllib3==2.0.2 - # via sentry-sdk + # via + # requests + # sentry-sdk +webencodings==0.5.1 + # via + # cssselect2 + # html5lib + # tinycss2 +xhtml2pdf==0.2.11 + # via la-chariotte (pyproject.toml)