Skip to content

[Extension] support .egg-info to store wheel type extension metadata #13286

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
haroldrandom merged 8 commits into from
May 7, 2020
Merged

[Extension] support .egg-info to store wheel type extension metadata #13286

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c001cf9
support .egg-info to store wheel type extension metadata
May 1, 2020
b3ed72f
raise ValueError instead of warning in case of bug
May 1, 2020
65cf627
add tests for wheel type and dev type extension
May 6, 2020
28d6ecd
add license
May 6, 2020
e06aa80
fix bug
May 6, 2020
cbfc649
fix style
May 6, 2020
a4731e1
Merge branch 'dev' into editable-whl-type-support-in-developing-exten…
fengzhou-msft May 7, 2020
d146a3e
remove unnecessary global varibales
May 7, 2020
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
18 changes: 13 additions & 5 deletions src/azure-cli-core/azure/cli/core/extension/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,27 @@ def get_metadata(self):
return None
metadata = {}
ext_dir = self.path or get_extension_path(self.name)
info_dirs = glob(os.path.join(ext_dir, self.name.replace('-', '_') + '-' + '*.dist-info'))

# include *.egg-info and *.dist-info
info_dirs = glob(os.path.join(ext_dir, self.name.replace('-', '_') + '-' + '*.*-info'))

azext_metadata = WheelExtension.get_azext_metadata(ext_dir)
if azext_metadata:
metadata.update(azext_metadata)

for dist_info_dirname in info_dirs:
try:
ext_whl_metadata = pkginfo.Wheel(dist_info_dirname)
if dist_info_dirname.endswith('.egg-info'):
ext_whl_metadata = pkginfo.Develop(dist_info_dirname)
elif dist_info_dirname.endswith('.dist-info'):
ext_whl_metadata = pkginfo.Wheel(dist_info_dirname)
else:
raise ValueError()

if self.name == ext_whl_metadata.name:
metadata.update(vars(ext_whl_metadata))
except ValueError:
logger.warning('extension % contains invalid metadata for Python Package', self.name)
logger.warning('extension %s contains invalid metadata for Python Package', self.name)

return metadata

Expand All @@ -177,13 +185,13 @@ def get_all():
if os.path.isdir(EXTENSIONS_DIR):
for ext_name in os.listdir(EXTENSIONS_DIR):
ext_path = os.path.join(EXTENSIONS_DIR, ext_name)
pattern = os.path.join(ext_path, '*.dist-info')
pattern = os.path.join(ext_path, '*.*-info') # include *.egg-info and *.dist-info
if os.path.isdir(ext_path) and glob(pattern):
exts.append(WheelExtension(ext_name, ext_path))
if os.path.isdir(EXTENSIONS_SYS_DIR):
for ext_name in os.listdir(EXTENSIONS_SYS_DIR):
ext_path = os.path.join(EXTENSIONS_SYS_DIR, ext_name)
pattern = os.path.join(ext_path, '*.dist-info')
pattern = os.path.join(ext_path, '*.*-info') # include *.egg-info and *.dist-info
if os.path.isdir(ext_path) and glob(pattern):
ext = WheelExtension(ext_name, ext_path)
if ext not in exts:
Expand Down