From 23a332850df6138f729b7b204b97706b3d2a367e Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 2 Feb 2023 14:27:34 +0100 Subject: [PATCH] Development: use `gunicorn` for `web` and `proxito` Match production environment by using `gunicorn` instead of the Django development server. --- readthedocs/wsgi.py | 11 ++--------- requirements/deploy.in | 1 - requirements/deploy.txt | 2 +- requirements/docker.txt | 2 ++ requirements/docs.txt | 2 ++ requirements/lint.txt | 2 ++ requirements/pip.in | 2 ++ requirements/pip.txt | 2 ++ requirements/testing.txt | 2 ++ 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/readthedocs/wsgi.py b/readthedocs/wsgi.py index 997fb628506..749073c416a 100644 --- a/readthedocs/wsgi.py +++ b/readthedocs/wsgi.py @@ -1,18 +1,11 @@ -# -*- coding: utf-8 -*- - """WSGI application helper.""" - -from __future__ import absolute_import import os -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'readthedocs.settings.dev') +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "readthedocs.settings.docker_compose") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION # setting points here. from django.core.wsgi import get_wsgi_application # noqa -application = get_wsgi_application() -# Apply WSGI middleware here. -# from helloworld.wsgi import HelloWorldApplication -# application = HelloWorldApplication(application) +application = get_wsgi_application() diff --git a/requirements/deploy.in b/requirements/deploy.in index fc0334bef74..c171732c1cd 100644 --- a/requirements/deploy.in +++ b/requirements/deploy.in @@ -3,7 +3,6 @@ -r pip.txt psycopg2 -gunicorn django-redis-cache # For resizing images diff --git a/requirements/deploy.txt b/requirements/deploy.txt index 190f796dd6f..4ef8fbfcb3e 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -200,7 +200,7 @@ gitdb==4.0.10 gitpython==3.1.30 # via -r requirements/pip.txt gunicorn==20.1.0 - # via -r requirements/deploy.in + # via -r requirements/pip.txt idna==3.4 # via # -r requirements/pip.txt diff --git a/requirements/docker.txt b/requirements/docker.txt index c19f66b9314..37289c4923d 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -211,6 +211,8 @@ gitdb==4.0.10 # gitpython gitpython==3.1.30 # via -r requirements/pip.txt +gunicorn==20.1.0 + # via -r requirements/pip.txt idna==3.4 # via # -r requirements/pip.txt diff --git a/requirements/docs.txt b/requirements/docs.txt index 004770f47ba..20b10e368a4 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -195,6 +195,8 @@ gitdb==4.0.10 # gitpython gitpython==3.1.30 # via -r requirements/pip.txt +gunicorn==20.1.0 + # via -r requirements/pip.txt idna==3.4 # via # -r requirements/pip.txt diff --git a/requirements/lint.txt b/requirements/lint.txt index 3d897df5808..7af399e9c8f 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -203,6 +203,8 @@ gitdb==4.0.10 # gitpython gitpython==3.1.30 # via -r requirements/pip.txt +gunicorn==20.1.0 + # via -r requirements/pip.txt idna==3.4 # via # -r requirements/pip.txt diff --git a/requirements/pip.in b/requirements/pip.in index efd724faba2..ec2f68ff6a1 100644 --- a/requirements/pip.in +++ b/requirements/pip.in @@ -130,3 +130,5 @@ django-structlog==2.2.0 structlog dparse + +gunicorn diff --git a/requirements/pip.txt b/requirements/pip.txt index 77b5d0e052f..829a40bad11 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -147,6 +147,8 @@ gitdb==4.0.10 # via gitpython gitpython==3.1.30 # via -r requirements/pip.in +gunicorn==20.1.0 + # via -r requirements/pip.in idna==3.4 # via requests imagesize==1.4.1 diff --git a/requirements/testing.txt b/requirements/testing.txt index 0c4348a7ec0..3619f52e474 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -196,6 +196,8 @@ gitdb==4.0.10 # gitpython gitpython==3.1.30 # via -r requirements/pip.txt +gunicorn==20.1.0 + # via -r requirements/pip.txt idna==3.4 # via # -r requirements/pip.txt