Skip to content

Commit e242508

Browse files
authored
Check for bad wheel first before checking the metadata matches (#139)
1 parent 58d46d0 commit e242508

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/ci/test_index.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ def test_metadata(self):
122122
ext_file = get_whl_from_url(item['downloadUrl'], item['filename'],
123123
self.whl_cache_dir, self.whl_cache)
124124
metadata = get_ext_metadata(ext_dir, ext_file, ext_name)
125-
self.assertDictEqual(metadata, item['metadata'],
126-
"Metadata for {} in index doesn't match the expected of: \n"
127-
"{}".format(item['filename'], json.dumps(metadata, indent=2, sort_keys=True,
128-
separators=(',', ': '))))
129125
# Due to https://github.com/pypa/wheel/issues/195 we prevent whls built with 0.31.0 or greater.
130126
# 0.29.0, 0.30.0 are the two previous versions before that release.
131127
supported_generators = ['bdist_wheel (0.29.0)', 'bdist_wheel (0.30.0)']
@@ -135,6 +131,10 @@ def test_metadata(self):
135131
"(e.g. `pip install wheel==0.30.0`). "
136132
"This is due to https://github.com/pypa/wheel/issues/195".format(ext_name,
137133
supported_generators))
134+
self.assertDictEqual(metadata, item['metadata'],
135+
"Metadata for {} in index doesn't match the expected of: \n"
136+
"{}".format(item['filename'], json.dumps(metadata, indent=2, sort_keys=True,
137+
separators=(',', ': '))))
138138
run_requires = metadata.get('run_requires')
139139
if run_requires and ext_name not in SKIP_DEP_CHECK:
140140
deps = run_requires[0]['requires']

0 commit comments

Comments
 (0)