From 2d4d019b5a8531324257f10cda552428beb718d1 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Sun, 2 Jul 2023 11:57:28 +0200 Subject: [PATCH] Settings: remove old settings It seems we are not using them anywhere. --- readthedocs/doc_builder/constants.py | 8 -------- readthedocs/settings/base.py | 17 ----------------- readthedocs/settings/docker_compose.py | 2 -- 3 files changed, 27 deletions(-) diff --git a/readthedocs/doc_builder/constants.py b/readthedocs/doc_builder/constants.py index 94220e6511e..cb41d94b2c6 100644 --- a/readthedocs/doc_builder/constants.py +++ b/readthedocs/doc_builder/constants.py @@ -16,14 +16,6 @@ DOCKER_IMAGE = settings.DOCKER_IMAGE DOCKER_IMAGE_SETTINGS = settings.DOCKER_IMAGE_SETTINGS DOCKER_LIMITS = settings.DOCKER_LIMITS - -old_config = settings.DOCKER_BUILD_IMAGES -if old_config: - log.warning( - 'Old config detected, DOCKER_BUILD_IMAGES->DOCKER_IMAGE_SETTINGS', - ) - DOCKER_IMAGE_SETTINGS.update(old_config) - DOCKER_TIMEOUT_EXIT_CODE = 42 DOCKER_OOM_EXIT_CODE = 137 diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py index 7a430b5b48d..a1b1350a4f2 100644 --- a/readthedocs/settings/base.py +++ b/readthedocs/settings/base.py @@ -539,16 +539,12 @@ def TEMPLATES(self): }, } - MULTIPLE_BUILD_SERVERS = [CELERY_DEFAULT_QUEUE] - # Sentry SENTRY_CELERY_IGNORE_EXPECTED = True # Docker DOCKER_ENABLE = False DOCKER_SOCKET = 'unix:///var/run/docker.sock' - # This settings has been deprecated in favor of DOCKER_IMAGE_SETTINGS - DOCKER_BUILD_IMAGES = None # User used to create the container. # In production we use the same user than the one defined by the @@ -923,19 +919,6 @@ def DOCKER_LIMITS(self): GRAVATAR_DEFAULT_IMAGE = 'https://assets.readthedocs.org/static/images/silhouette.png' # NOQA OAUTH_AVATAR_USER_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE OAUTH_AVATAR_ORG_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE - RESTRUCTUREDTEXT_FILTER_SETTINGS = { - 'cloak_email_addresses': True, - 'file_insertion_enabled': False, - 'raw_enabled': False, - 'strip_comments': True, - 'doctitle_xform': True, - 'sectsubtitle_xform': True, - 'initial_header_level': 2, - 'report_level': 5, - 'syntax_highlight': 'none', - 'math_output': 'latex', - 'field_name_limit': 50, - } REST_FRAMEWORK = { 'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',), 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', # NOQA diff --git a/readthedocs/settings/docker_compose.py b/readthedocs/settings/docker_compose.py index bb9a2fef33a..2159db983de 100644 --- a/readthedocs/settings/docker_compose.py +++ b/readthedocs/settings/docker_compose.py @@ -30,8 +30,6 @@ class DockerBaseSettings(CommunityBaseSettings): # In the local docker environment, nginx should be trusted to set the host correctly USE_X_FORWARDED_HOST = True - MULTIPLE_BUILD_SERVERS = ['build'] - # https://docs.docker.com/engine/reference/commandline/run/#add-entries-to-container-hosts-file---add-host # export HOSTIP=`ip -4 addr show scope global dev wlp4s0 | grep inet | awk '{print \$2}' | cut -d / -f 1` HOSTIP = os.environ.get('HOSTIP')