From 0e3b0fa80075e0b4f82fe896cef3eb8ee0e4651b Mon Sep 17 00:00:00 2001 From: Derek Bekoe Date: Mon, 16 Apr 2018 12:25:41 -0700 Subject: [PATCH] Check for bad wheel first before checking the metadata matches --- scripts/ci/test_index.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ci/test_index.py b/scripts/ci/test_index.py index 3b58a264132..9dfb4029731 100755 --- a/scripts/ci/test_index.py +++ b/scripts/ci/test_index.py @@ -122,10 +122,6 @@ def test_metadata(self): ext_file = get_whl_from_url(item['downloadUrl'], item['filename'], self.whl_cache_dir, self.whl_cache) metadata = get_ext_metadata(ext_dir, ext_file, ext_name) - self.assertDictEqual(metadata, item['metadata'], - "Metadata for {} in index doesn't match the expected of: \n" - "{}".format(item['filename'], json.dumps(metadata, indent=2, sort_keys=True, - separators=(',', ': ')))) # Due to https://github.com/pypa/wheel/issues/195 we prevent whls built with 0.31.0 or greater. # 0.29.0, 0.30.0 are the two previous versions before that release. supported_generators = ['bdist_wheel (0.29.0)', 'bdist_wheel (0.30.0)'] @@ -135,6 +131,10 @@ def test_metadata(self): "(e.g. `pip install wheel==0.30.0`). " "This is due to https://github.com/pypa/wheel/issues/195".format(ext_name, supported_generators)) + self.assertDictEqual(metadata, item['metadata'], + "Metadata for {} in index doesn't match the expected of: \n" + "{}".format(item['filename'], json.dumps(metadata, indent=2, sort_keys=True, + separators=(',', ': ')))) run_requires = metadata.get('run_requires') if run_requires and ext_name not in SKIP_DEP_CHECK: deps = run_requires[0]['requires']