Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dead code from config module #5116

Merged
merged 1 commit into from
Jan 17, 2019
Merged

Remove dead code from config module #5116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions readthedocs/config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,12 +405,6 @@ def validate_build(self):
self.env_config.update(
DOCKER_IMAGE_SETTINGS[build['image']]
)
# Update docker settings from user config
if 'DOCKER_IMAGE_SETTINGS' in self.env_config and \
build['image'] in self.env_config['DOCKER_IMAGE_SETTINGS']:
self.env_config.update(
self.env_config['DOCKER_IMAGE_SETTINGS'][build['image']]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already updated above (lines 403..407)

)

# Allow to override specific project
config_image = self.defaults.get('build_image')
Expand Down
1 change: 0 additions & 1 deletion readthedocs/doc_builder/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ def load_yaml_config(version):
img_settings = DOCKER_IMAGE_SETTINGS.get(img_name, None)
if img_settings:
env_config.update(img_settings)
env_config['DOCKER_IMAGE_SETTINGS'] = img_settings

try:
config = load_config(
Expand Down