Skip to content

Update Dependency Script to Key of Package Name for SDIST, update overrides to match #7253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scbedd merged 12 commits into from
Sep 13, 2019
Merged

Update Dependency Script to Key of Package Name for SDIST, update overrides to match #7253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6d341d2
increase timeout for pypy, adjust error output
scbedd Sep 12, 2019
25842b5
touching a cogservices file to trigger that ci
scbedd Sep 12, 2019
ebaebf0
updating build-artifacts to generate python2 nspkgs if any exist
scbedd Sep 12, 2019
e4f8f23
make certain that None doesn't get passed instead of emptystring
scbedd Sep 12, 2019
54dcf83
no pathlib
scbedd Sep 12, 2019
50ccabc
attempt with simpler logic on targeting. does this work appropriately?
scbedd Sep 12, 2019
9fb7031
Merge remote-tracking branch 'upstream/master' into address-nspkg-fai…
scbedd Sep 12, 2019
433cb66
remove extraneous arg
scbedd Sep 12, 2019
9f0561b
pulling from package name, not folder
scbedd Sep 13, 2019
c9c93ca
Merge remote-tracking branch 'upstream/master' into resolve-dependenc…
scbedd Sep 13, 2019
9d6dce5
touch a dev_requirements in eventhub to confirm that the overrides st…
scbedd Sep 13, 2019
f1319fe
removing whitespace that was unintentionally added
scbedd Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions scripts/analyze_deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/azure-mgmt-eventhub/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
4 changes: 2 additions & 2 deletions shared_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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