From fff87dffbcb8a8f8d2cba6dd0ca69135dacf1e00 Mon Sep 17 00:00:00 2001 From: Derek Bekoe Date: Mon, 9 Apr 2018 13:01:02 -0700 Subject: [PATCH 1/2] Closes https://github.com/Azure/azure-cli-extensions/issues/128 --- scripts/ci/test_index.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/ci/test_index.py b/scripts/ci/test_index.py index 04dcc965fd7..38afc012f42 100755 --- a/scripts/ci/test_index.py +++ b/scripts/ci/test_index.py @@ -126,6 +126,11 @@ def test_metadata(self): "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)'] + self.assertIn(metadata.get('generator'), supported_generators, + "'generator' should be one of {}. Build the extension with a different version of the 'wheel' package (e.g. `pip install wheel==0.30.0`). This is due to https://github.com/pypa/wheel/issues/195".format(supported_generators)) run_requires = metadata.get('run_requires') if run_requires and ext_name not in SKIP_DEP_CHECK: deps = run_requires[0]['requires'] From 765658a49fc4aa04267368d95642266076c7daf0 Mon Sep 17 00:00:00 2001 From: Derek Bekoe Date: Mon, 9 Apr 2018 13:18:31 -0700 Subject: [PATCH 2/2] Fix style --- .travis.yml | 2 +- scripts/ci/test_index.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1fd555fec1..d90668cb446 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: python services: - docker install: - - pip install pylint flake8 requests -q + - pip install pylint flake8 requests wheel==0.30.0 -q jobs: include: - stage: verify diff --git a/scripts/ci/test_index.py b/scripts/ci/test_index.py index 38afc012f42..3b58a264132 100755 --- a/scripts/ci/test_index.py +++ b/scripts/ci/test_index.py @@ -130,7 +130,11 @@ def test_metadata(self): # 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)'] self.assertIn(metadata.get('generator'), supported_generators, - "'generator' should be one of {}. Build the extension with a different version of the 'wheel' package (e.g. `pip install wheel==0.30.0`). This is due to https://github.com/pypa/wheel/issues/195".format(supported_generators)) + "{}: 'generator' should be one of {}. " + "Build the extension with a different version of the 'wheel' package " + "(e.g. `pip install wheel==0.30.0`). " + "This is due to https://github.com/pypa/wheel/issues/195".format(ext_name, + supported_generators)) run_requires = metadata.get('run_requires') if run_requires and ext_name not in SKIP_DEP_CHECK: deps = run_requires[0]['requires']