diff --git a/scripts/ci/test_index.py b/scripts/ci/test_index.py index 88870a50ef6..744fa2ab7c5 100755 --- a/scripts/ci/test_index.py +++ b/scripts/ci/test_index.py @@ -19,7 +19,7 @@ from packaging import version from wheel.install import WHEEL_INFO_RE -from util import get_ext_metadata, get_whl_from_url, get_index_data, verify_dependency +from util import get_ext_metadata, get_whl_from_url, get_index_data def get_sha256sum(a_file): @@ -183,13 +183,7 @@ 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=(',', ': ')))) - run_requires = metadata.get('run_requires') - if run_requires: - deps = run_requires[0]['requires'] - self.assertTrue( - all(verify_dependency(dep) for dep in deps), - "Dependencies of {} use disallowed extension dependencies. " - "Remove these dependencies: {}".format(item['filename'], deps)) + shutil.rmtree(extensions_dir) diff --git a/scripts/ci/test_source.py b/scripts/ci/test_source.py index f8a993e3fce..902c63d720b 100755 --- a/scripts/ci/test_source.py +++ b/scripts/ci/test_source.py @@ -19,7 +19,7 @@ from wheel.install import WHEEL_INFO_RE from six import with_metaclass -from util import get_ext_metadata, verify_dependency, SRC_PATH +from util import SRC_PATH ALL_TESTS = [] @@ -104,17 +104,6 @@ def test_source_wheels(self): check_output(['python', 'setup.py', 'bdist_wheel', '-q', '-d', built_whl_dir], cwd=s) except CalledProcessError as err: self.fail("Unable to build extension {} : {}".format(s, err)) - for filename in os.listdir(built_whl_dir): - ext_file = os.path.join(built_whl_dir, filename) - ext_dir = tempfile.mkdtemp(dir=built_whl_dir) - ext_name = WHEEL_INFO_RE(filename).groupdict().get('name') - metadata = get_ext_metadata(ext_dir, ext_file, ext_name) - run_requires = metadata.get('run_requires') - if run_requires: - deps = run_requires[0]['requires'] - self.assertTrue(all(verify_dependency(dep) for dep in deps), - "Dependencies of {} use disallowed extension dependencies. " - "Remove these dependencies: {}".format(filename, deps)) shutil.rmtree(built_whl_dir) diff --git a/scripts/ci/util.py b/scripts/ci/util.py index 41291548c50..37dba388a2a 100644 --- a/scripts/ci/util.py +++ b/scripts/ci/util.py @@ -8,10 +8,6 @@ import json import zipfile -# Dependencies that will not be checked. -# This is for packages starting with 'azure-' but do not use the 'azure' namespace. -SKIP_DEP_CHECK = ['azure-batch-extensions'] - # copy from wheel==0.30.0 WHEEL_INFO_RE = re.compile( r"""^(?P(?P.+?)(-(?P\d.+?))?) @@ -121,10 +117,3 @@ def get_index_data(): return json.load(f, object_pairs_hook=_catch_dup_keys) except ValueError as err: raise AssertionError("Invalid JSON in {}: {}".format(INDEX_PATH, err)) - - -def verify_dependency(dep): - # ex. "azure-batch-extensions (<3.1,>=3.0.0)", "paho-mqtt (==1.3.1)", "pyyaml" - # check if 'azure-' dependency, as they use 'azure' namespace. - dep_split = dep.split() - return not (dep_split and dep_split[0].startswith('azure-') and dep_split[0] not in SKIP_DEP_CHECK)