Skip to content

Commit f7d390c

Browse files
authored
Settings: remove old settings (#10504)
It seems we are not using them anywhere.
1 parent d7abacc commit f7d390c

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

readthedocs/doc_builder/constants.py

-8
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616
DOCKER_IMAGE = settings.DOCKER_IMAGE
1717
DOCKER_IMAGE_SETTINGS = settings.DOCKER_IMAGE_SETTINGS
1818
DOCKER_LIMITS = settings.DOCKER_LIMITS
19-
20-
old_config = settings.DOCKER_BUILD_IMAGES
21-
if old_config:
22-
log.warning(
23-
'Old config detected, DOCKER_BUILD_IMAGES->DOCKER_IMAGE_SETTINGS',
24-
)
25-
DOCKER_IMAGE_SETTINGS.update(old_config)
26-
2719
DOCKER_TIMEOUT_EXIT_CODE = 42
2820
DOCKER_OOM_EXIT_CODE = 137
2921

readthedocs/settings/base.py

-17
Original file line numberDiff line numberDiff line change
@@ -539,16 +539,12 @@ def TEMPLATES(self):
539539
},
540540
}
541541

542-
MULTIPLE_BUILD_SERVERS = [CELERY_DEFAULT_QUEUE]
543-
544542
# Sentry
545543
SENTRY_CELERY_IGNORE_EXPECTED = True
546544

547545
# Docker
548546
DOCKER_ENABLE = False
549547
DOCKER_SOCKET = 'unix:///var/run/docker.sock'
550-
# This settings has been deprecated in favor of DOCKER_IMAGE_SETTINGS
551-
DOCKER_BUILD_IMAGES = None
552548

553549
# User used to create the container.
554550
# In production we use the same user than the one defined by the
@@ -923,19 +919,6 @@ def DOCKER_LIMITS(self):
923919
GRAVATAR_DEFAULT_IMAGE = 'https://assets.readthedocs.org/static/images/silhouette.png' # NOQA
924920
OAUTH_AVATAR_USER_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE
925921
OAUTH_AVATAR_ORG_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE
926-
RESTRUCTUREDTEXT_FILTER_SETTINGS = {
927-
'cloak_email_addresses': True,
928-
'file_insertion_enabled': False,
929-
'raw_enabled': False,
930-
'strip_comments': True,
931-
'doctitle_xform': True,
932-
'sectsubtitle_xform': True,
933-
'initial_header_level': 2,
934-
'report_level': 5,
935-
'syntax_highlight': 'none',
936-
'math_output': 'latex',
937-
'field_name_limit': 50,
938-
}
939922
REST_FRAMEWORK = {
940923
'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',),
941924
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', # NOQA

readthedocs/settings/docker_compose.py

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class DockerBaseSettings(CommunityBaseSettings):
3030
# In the local docker environment, nginx should be trusted to set the host correctly
3131
USE_X_FORWARDED_HOST = True
3232

33-
MULTIPLE_BUILD_SERVERS = ['build']
34-
3533
# https://docs.docker.com/engine/reference/commandline/run/#add-entries-to-container-hosts-file---add-host
3634
# export HOSTIP=`ip -4 addr show scope global dev wlp4s0 | grep inet | awk '{print \$2}' | cut -d / -f 1`
3735
HOSTIP = os.environ.get('HOSTIP')

0 commit comments

Comments
 (0)