|
35 | 35 | ) |
36 | 36 |
|
37 | 37 | from ..log import VERBOSE_LOG_FMT, ThreadLogFilter, req_ctxvar_context |
| 38 | +from .build_order import check_source_providers |
38 | 39 |
|
39 | 40 | logger = logging.getLogger(__name__) |
40 | 41 |
|
@@ -177,36 +178,37 @@ def build_sequence( |
177 | 178 |
|
178 | 179 | logger.info("reading build order from %s", build_order_file) |
179 | 180 | with read.open_file_or_url(build_order_file) as f: |
180 | | - for entry in progress.progress(json.load(f)): |
181 | | - dist_name = entry["dist"] |
182 | | - resolved_version = Version(entry["version"]) |
183 | | - source_download_url = entry["source_url"] |
184 | | - |
185 | | - req = Requirement(f"{dist_name}=={resolved_version}") |
186 | | - |
187 | | - with req_ctxvar_context(req, resolved_version): |
188 | | - logger.info("building %s", resolved_version) |
189 | | - entry = _build( |
190 | | - wkctx=wkctx, |
191 | | - resolved_version=resolved_version, |
192 | | - req=req, |
193 | | - source_download_url=source_download_url, |
194 | | - force=force, |
195 | | - cache_wheel_server_url=cache_wheel_server_url, |
| 181 | + build_order = json.load(f) |
| 182 | + # Check provider consistency for every entry, including prebuilt wheels. |
| 183 | + check_source_providers(wkctx, build_order) |
| 184 | + for entry in progress.progress(build_order): |
| 185 | + dist_name = entry["dist"] |
| 186 | + resolved_version = Version(entry["version"]) |
| 187 | + source_download_url = entry["source_url"] |
| 188 | + |
| 189 | + req = Requirement(f"{dist_name}=={resolved_version}") |
| 190 | + |
| 191 | + with req_ctxvar_context(req, resolved_version): |
| 192 | + logger.info("building %s", resolved_version) |
| 193 | + entry = _build( |
| 194 | + wkctx=wkctx, |
| 195 | + resolved_version=resolved_version, |
| 196 | + req=req, |
| 197 | + source_download_url=source_download_url, |
| 198 | + force=force, |
| 199 | + cache_wheel_server_url=cache_wheel_server_url, |
| 200 | + ) |
| 201 | + if entry.prebuilt: |
| 202 | + logger.info("downloaded prebuilt wheel %s", entry.wheel_filename.name) |
| 203 | + elif entry.skipped: |
| 204 | + logger.info( |
| 205 | + "skipping building wheel since %s already exists", |
| 206 | + entry.wheel_filename.name, |
196 | 207 | ) |
197 | | - if entry.prebuilt: |
198 | | - logger.info( |
199 | | - "downloaded prebuilt wheel %s", entry.wheel_filename.name |
200 | | - ) |
201 | | - elif entry.skipped: |
202 | | - logger.info( |
203 | | - "skipping building wheel since %s already exists", |
204 | | - entry.wheel_filename.name, |
205 | | - ) |
206 | | - else: |
207 | | - logger.info("built %s", entry.wheel_filename.name) |
| 208 | + else: |
| 209 | + logger.info("built %s", entry.wheel_filename.name) |
208 | 210 |
|
209 | | - entries.append(entry) |
| 211 | + entries.append(entry) |
210 | 212 |
|
211 | 213 | metrics.summarize(wkctx, "Building") |
212 | 214 |
|
|
0 commit comments