Merge remote-tracking branch 'origin/main'

# Conflicts:
#	requirements/base.txt
This commit is contained in:
Alexander Karpov 2022-11-25 12:16:37 +03:00
commit b94ee139c7
4 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
FROM traefik:v2.2.11 FROM traefik:2.9.5
RUN mkdir -p /etc/traefik/acme \ RUN mkdir -p /etc/traefik/acme \
&& touch /etc/traefik/acme/acme.json \ && touch /etc/traefik/acme/acme.json \
&& chmod 600 /etc/traefik/acme/acme.json && chmod 600 /etc/traefik/acme/acme.json

View File

@ -1,10 +1,10 @@
pytz==2022.6 # https://github.com/stub42/pytz pytz==2022.6 # https://github.com/stub42/pytz
psutil==5.9.4 psutil==5.9.4
python-slugify==6.1.2 # https://github.com/un33k/python-slugify python-slugify==7.0.0 # https://github.com/un33k/python-slugify
Pillow==9.3.0 # https://github.com/python-pillow/Pillow Pillow==9.3.0 # https://github.com/python-pillow/Pillow
argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi
whitenoise==6.2.0 # https://github.com/evansd/whitenoise whitenoise==6.2.0 # https://github.com/evansd/whitenoise
redis==4.3.4 # https://github.com/redis/redis-py redis==4.3.5 # https://github.com/redis/redis-py
hiredis==2.0.0 # https://github.com/redis/hiredis-py hiredis==2.0.0 # https://github.com/redis/hiredis-py
celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery
django-celery-beat==2.4.0 # https://github.com/celery/django-celery-beat django-celery-beat==2.4.0 # https://github.com/celery/django-celery-beat

View File

@ -8,7 +8,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles
# Testing # Testing
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
mypy==0.982 # https://github.com/python/mypy mypy==0.982 # https://github.com/python/mypy
django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs django-stubs==1.13.0 # https://github.com/typeddjango/django-stubs
pytest==7.2.0 # https://github.com/pytest-dev/pytest pytest==7.2.0 # https://github.com/pytest-dev/pytest
pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar
djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestframework-stubs djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestframework-stubs
@ -21,7 +21,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
# Code quality # Code quality
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
flake8==5.0.4 # https://github.com/PyCQA/flake8 flake8==5.0.4 # https://github.com/PyCQA/flake8
flake8-isort==5.0.0 # https://github.com/gforcada/flake8-isort flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort
coverage==6.5.0 # https://github.com/nedbat/coveragepy coverage==6.5.0 # https://github.com/nedbat/coveragepy
black==22.10.0 # https://github.com/psf/black black==22.10.0 # https://github.com/psf/black
pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django

View File

@ -4,7 +4,7 @@
gunicorn==20.1.0 # https://github.com/benoitc/gunicorn gunicorn==20.1.0 # https://github.com/benoitc/gunicorn
psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 psycopg2==2.9.5 # https://github.com/psycopg/psycopg2
sentry-sdk==1.10.1 # https://github.com/getsentry/sentry-python sentry-sdk==1.11.1 # https://github.com/getsentry/sentry-python
# Django # Django
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------