diff --git a/scripts/analyze_deps.py b/scripts/analyze_deps.py index 6efbded72f14..783220fe6f55 100755 --- a/scripts/analyze_deps.py +++ b/scripts/analyze_deps.py @@ -51,12 +51,12 @@ def get_lib_deps(base_dir): dependencies = {} for lib_dir in locate_libs(base_dir): try: - lib_name = os.path.basename(lib_dir) + setup_path = os.path.join(lib_dir, 'setup.py') + lib_name, version, requires = parse_setup(setup_path) + if should_skip_lib(lib_name): continue - setup_path = os.path.join(lib_dir, 'setup.py') - version, requires = parse_setup(setup_path) - + packages[lib_name] = { 'version': version, 'source': lib_dir @@ -127,13 +127,14 @@ def setup(*args, **kwargs): _, kwargs = global_vars['__setup_calls__'][0] version = kwargs['version'] + name = kwargs['name'] requires = [] if 'install_requires' in kwargs: requires += kwargs['install_requires'] if 'extras_require' in kwargs: for extra in kwargs['extras_require'].values(): requires += extra - return version, requires + return name, version, requires def dict_compare(d1, d2): d1_keys = set(d1.keys()) diff --git a/sdk/eventhub/azure-mgmt-eventhub/dev_requirements.txt b/sdk/eventhub/azure-mgmt-eventhub/dev_requirements.txt index 6ccb7f031ddd..f6457a93d5e8 100644 --- a/sdk/eventhub/azure-mgmt-eventhub/dev_requirements.txt +++ b/sdk/eventhub/azure-mgmt-eventhub/dev_requirements.txt @@ -1 +1 @@ --e ../../../tools/azure-sdk-tools +-e ../../../tools/azure-sdk-tools \ No newline at end of file diff --git a/shared_requirements.txt b/shared_requirements.txt index a5161a922b10..637c149e999d 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -107,5 +107,5 @@ six>=1.6 #override azure-storage-queue azure-core<2.0.0,>=1.0.0b3 #override azure-storage-file azure-core<2.0.0,>=1.0.0b3 #override azure-cosmos azure-core<2.0.0,>=1.0.0b3 -#override azure-eventhubs-checkpointstoreblob-aio azure-storage-blob<12.0.0b4,>=12.0.0b2 -#override azure-eventhubs-checkpointstoreblob-aio aiohttp<4.0,>=3.0 +#override azure-eventhub-checkpointstoreblob-aio azure-storage-blob<12.0.0b4,>=12.0.0b2 +#override azure-eventhub-checkpointstoreblob-aio aiohttp<4.0,>=3.0