Skip to content

Commit 05c2aed

Browse files
committed
Make it compatible with current master
1 parent 85d7603 commit 05c2aed

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

readthedocs/doc_builder/python_environments.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ def is_obsolete(self):
141141
# one coming from the project version config.
142142
return any([
143143
env_python_version != Version(self.config.python_version),
144-
env_build_image != self.config.build_image,
144+
# TODO: remove getattr when https://github.com/rtfd/readthedocs.org/pull/3339 got merged
145+
env_build_image != getattr(self.config, 'build_image', self.version.project.container_image),
145146
])
146147

147148
def save_environment_json(self):
@@ -153,7 +154,8 @@ def save_environment_json(self):
153154
'version': self.config.python_version,
154155
},
155156
'build': {
156-
'image': self.config.build_image,
157+
# TODO: remove getattr when https://github.com/rtfd/readthedocs.org/pull/3339 got merged
158+
'image': getattr(self.config, 'build_image', self.version.project.container_image),
157159
},
158160
}
159161
with open(self.environment_json_path(), 'w') as fpath:

0 commit comments

Comments
 (0)