Skip to content

Commit

Permalink
Support pip install of the CLI [115737651]
Browse files Browse the repository at this point in the history
  • Loading branch information
derekbekoe committed Mar 17, 2016
1 parent b0c0eb9 commit c7d18a6
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 18 deletions.
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include *.rst
exclude src/azure/__init__.py
2 changes: 1 addition & 1 deletion src/README.rst → README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Microsoft Azure Command-Line Tools
==================================

This is the Microsoft Azure Service Bus Runtime Client Library.
This is the Microsoft Azure CLI.

This package has [not] been tested [much] with Python 2.7, 3.4 and 3.5.

Expand Down
File renamed without changes.
29 changes: 14 additions & 15 deletions src/setup.py → setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# If we have source, validate that our version numbers match
# This should prevent uploading releases with mismatched versions.
try:
with open('azure/cli/__init__.py', 'r', encoding='utf-8') as f:
with open('src/azure/cli/__init__.py', 'r', encoding='utf-8') as f:
content = f.read()
except OSError:
pass
Expand All @@ -42,6 +42,8 @@
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
CLASSIFIERS = [
'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
Expand All @@ -52,19 +54,10 @@
#'License :: OSI Approved :: MIT License',
]

# The azure-mgmt requirement should always be pinned to ensure
# that installing a specific azure-cli version will target the
# expected Azure API versions
#
# Alternatively, the more specific requirements such as
# azure-mgmt-resource may be specified in place of the roll-up
# packages.
#
# Common azure package dependencies will be pulled in by these
# references, so do not specify azure-common or -nspkg here.
DEPENDENCIES = [
'azure-mgmt==0.20.2',
'azure-storage==0.20.3',
'applicationinsights',
'azure==2.0.0rc1',
'six',
]

with open('README.rst', 'r', encoding='utf-8') as f:
Expand All @@ -77,13 +70,19 @@
long_description=README,
license='TBD',
author='Microsoft Corporation',
author_email='SOMEBODY@microsoft.com',
author_email='azpycli@microsoft.com',
url='https://github.com/Azure/azure-cli',
classifiers=CLASSIFIERS,
zip_safe=False,
scripts=[
'az',
'az.completion.sh',
'az.bat',
],
package_dir = {'':'src'},
packages=[
'azure.cli',
'azure.cli.commands',
],
package_data={'azure.cli': ['locale/**/*.txt']},
install_requires=DEPENDENCIES,
)
2 changes: 0 additions & 2 deletions src/MANIFEST.in

This file was deleted.

0 comments on commit c7d18a6

Please sign in to comment.