Skip to content

Commit

Permalink
Setup fixes (#104)
Browse files Browse the repository at this point in the history
  • Loading branch information
tjprescott authored Jul 2, 2019
1 parent f1fe18e commit 1e8e696
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 67 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ azdev.egg-info/
.tox/
*.idea
pip-wheel-metadata/*
build/
dist/
4 changes: 4 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
Release History
===============

0.1.1
++++++
* `azdev cli/extension create`: Fix issue where supporting files were not included. Adjust generation logic.

0.1.0
++++++
* Update for compatability with azure-cli 2.0.68's new package structure.
Expand Down
4 changes: 3 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include LICENSE.txt
include HISTORY.rst
include README.md
include README.md
recursive-include azdev/config *
recursive-include azdev/mod_templates *
2 changes: 1 addition & 1 deletion azdev/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# license information.
# -----------------------------------------------------------------------------

__VERSION__ = '0.1.0'
__VERSION__ = '0.1.1'
1 change: 0 additions & 1 deletion azdev/mod_templates/MANIFEST.in

This file was deleted.

2 changes: 1 addition & 1 deletion azdev/mod_templates/azext_metadata.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
{% if is_preview %}"azext.isPreview": true,{% endif %}
"azext.minCliCoreVersion": "2.0.66",
"azext.minCliCoreVersion": "2.0.67",
"azext.maxCliCoreVersion": "2.1.0"
}
53 changes: 0 additions & 53 deletions azdev/mod_templates/azure_bdist_wheel.py

This file was deleted.

18 changes: 8 additions & 10 deletions azdev/operations/code_gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,16 +262,14 @@ def _create_package(prefix, repo_path, is_ext, name='test', display_name=None, d

# generate code for root level
dest_path = new_package_path
root_files = [
'HISTORY.rst',
'MANIFEST.in',
'README.rst',
'setup.cfg',
'setup.py'
]
if not is_ext:
root_files.append('azure_bdist_wheel.py')
_generate_files(env, kwargs, root_files, dest_path)
if is_ext:
root_files = [
'HISTORY.rst',
'README.rst',
'setup.cfg',
'setup.py'
]
_generate_files(env, kwargs, root_files, dest_path)

dest_path = dest_path if not is_ext else os.path.join(dest_path, ext_folder)
module_files = [
Expand Down

0 comments on commit 1e8e696

Please sign in to comment.