Skip to content
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

Update packaging tool only #21973

Merged
merged 3 commits into from
Dec 3, 2021
Merged

Update packaging tool only #21973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21a5d1f
update packaging tool
xiangyan99 Dec 2, 2021
c262575
revert toml changes
xiangyan99 Dec 2, 2021
bce777f
update
xiangyan99 Dec 2, 2021
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
5 changes: 4 additions & 1 deletion tools/azure-sdk-tools/packaging_tools/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ def build_config(config: Dict[str, Any]) -> Dict[str, str]:
result["is_arm"] = result.pop("is_arm", True)

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

# Do I need azure-mgmt-core for this package?
result["need_azuremgmtcore"] = result.pop("need_azuremgmtcore", True)

# Pre-compute some Jinja variable that are complicated to do inside the templates
package_parts = result["package_nspkg"][: -len("-nspkg")].split("-")
Expand Down
6 changes: 3 additions & 3 deletions ...ols/packaging_tools/templates/LICENSE.txt → ...k-tools/packaging_tools/templates/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) Microsoft Corporation.

Copyright (c) 2021 Microsoft
MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -12,7 +12,7 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
Expand Down
3 changes: 2 additions & 1 deletion tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include _meta.json
recursive-include tests *.py *.yaml
include *.md
{%- for init_name in init_names %}
include {{ init_name }}
{%- endfor %}
include LICENSE.txt
include LICENSE
1 change: 1 addition & 0 deletions tools/azure-sdk-tools/packaging_tools/templates/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'License :: OSI Approved :: MIT License',
],
zip_safe=False,
Expand Down