diff --git a/.gitignore b/.gitignore index f1023ab..82f9275 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,162 @@ -.bundle/ -.env -.idea/ -.sublime-* -*.mo -*.pot -*.pyc -*.sql.xz -*.sqlite* -/static/ -/venv* +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python build/ -node_modules/ -nohup.out +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs pip-log.txt -rev-manifest.json -tmp/ -virtualenv/ -*.compiled.yaml -*.local.yaml +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ diff --git a/Dockerfile b/Dockerfile index f18c2e1..37791af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN git clone --depth=1 https://github.com/kcsry/infokala && \ NODE_ENV=production npm run prepublish && \ rm -rf node_modules -FROM python:3.11 +FROM python:3.12 COPY --from=0 /usr/src/app/infokala /usr/src/app/infokala RUN mkdir /usr/src/app/infokala-tracon && \ groupadd -r infokala && useradd -r -g infokala infokala diff --git a/requirements.in b/requirements.in index 95f4d44..966d678 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,4 @@ -Django +Django<5 django-environ gunicorn psycopg2 diff --git a/requirements.txt b/requirements.txt index 36edb89..4a74091 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,40 +1,36 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --resolver=backtracking -# -asgiref==3.7.2 +# This file was autogenerated by uv via the following command: +# uv pip compile requirements.in +asgiref==3.8.1 # via django -certifi==2023.7.22 +certifi==2024.7.4 # via requests -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests -django==4.2.4 +django==4.2.15 # via -r requirements.in django-environ==0.11.2 # via -r requirements.in -gunicorn==21.2.0 +gunicorn==23.0.0 # via -r requirements.in -idna==3.4 +idna==3.8 # via requests oauthlib==3.2.2 # via requests-oauthlib -packaging==23.1 +packaging==24.1 # via gunicorn -psycopg2==2.9.7 +psycopg2==2.9.9 # via -r requirements.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via -r requirements.in -requests==2.31.0 +requests==2.32.3 # via requests-oauthlib -requests-oauthlib==1.3.1 +requests-oauthlib==2.0.0 # via -r requirements.in six==1.16.0 # via python-dateutil -sqlparse==0.4.4 +sqlparse==0.5.1 # via django -urllib3==2.0.4 +urllib3==2.2.2 # via requests -whitenoise==6.5.0 +whitenoise==6.7.0 # via -r requirements.in