Skip to content

Commit

Permalink
Add package option to not need msrestazure
Browse files Browse the repository at this point in the history
  • Loading branch information
lmazuel committed Nov 9, 2018
1 parent e975afc commit feb8d61
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions azure-sdk-tools/packaging_tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ def build_config(config : Dict[str, Any]) -> Dict[str, str]:
# ARM?
result['is_arm'] = result.pop("is_arm", True)

# Do I need msrestazure for this package?
result['need_msrestazure'] = result.pop("need_msrestazure", True)

# Pre-compute some Jinja variable that are complicated to do inside the templates
package_parts = result["package_nspkg"][:-len('-nspkg')].split('-')
result['nspkg_names'] = [
Expand Down
3 changes: 2 additions & 1 deletion azure-sdk-tools/packaging_tools/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"package_pprint_name": "MyService Management",
"package_doc_id": "",
"is_stable": False,
"is_arm": True
"is_arm": True,
"need_msrestazure": True
}

def read_conf(folder: Path) -> Dict[str, Any]:
Expand Down
2 changes: 2 additions & 0 deletions azure-sdk-tools/packaging_tools/templates/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@
]),
install_requires=[
'msrest>=0.5.0',
{%- if need_msrestazure %}
'msrestazure>=0.4.32,<2.0.0',
{%- endif %}
'azure-common~=1.1',
],
extras_require={
Expand Down

0 comments on commit feb8d61

Please sign in to comment.