fix conflicts

packaged_releases/HISTORY.md

@@ -1,6 +1,56 @@
 Release History
 ===============
 
+0.2.7 (2017-05-05)
+------------------
+
+* See the `HISTORY.rst` files in each module for a changelog.  
+
+Source download:  
+https://azurecliprod.blob.core.windows.net/releases/azure-cli_packaged_0.2.7.tar.gz
+sha256 66882e5ca6ae78aa4d99bc3440ceaf42e969df43374b0c223f66f79b69329bb8
+
+---
+
+<details>
+  <summary>List of component versions in this release (click to expand)</summary><p>
+$ az --version  
+azure-cli (2.0.5)  
+
+acr (2.0.3)  
+acs (2.0.5)  
+appservice (0.1.5)  
+batch (2.0.3)  
+cdn (0.0.1)  
+cloud (2.0.2)  
+cognitiveservices (0.1.1)  
+command-modules-nspkg (2.0.0)  
+component (2.0.3)  
+configure (2.0.5)  
+core (2.0.5)  
+dla (0.0.5)  
+dls (0.0.5)  
+documentdb (0.1.5)  
+feedback (2.0.2)  
+find (0.2.2)  
+interactive (0.3.0)  
+iot (0.1.5)  
+keyvault (2.0.3)  
+lab (0.0.4)  
+monitor (0.0.3)  
+network (2.0.5)  
+nspkg (3.0.0)  
+profile (2.0.4)  
+redis (0.2.2)  
+resource (2.0.5)  
+role (2.0.3)  
+sf (1.0.0)  
+sql (2.0.2)  
+storage (2.0.5)  
+vm (2.0.5)  
+</p></details>
+
+
 0.2.6 (2017-04-28)
 ------------------
 

packaged_releases/debian/README.md

@@ -17,8 +17,8 @@ $ chmod +x ~/debian_build.sh ~/debian_dir_creator.sh
 
 Then execute it with the appropriate environment variable values.
 ```
-$ export CLI_VERSION=0.2.6 \
-    && export CLI_DOWNLOAD_SHA256=d2a6abae2a64a0262a9ab97170cb280a67656f3f82837dbb8b42c0f9737f0049 \
+$ export CLI_VERSION=0.2.7 \
+    && export CLI_DOWNLOAD_SHA256=66882e5ca6ae78aa4d99bc3440ceaf42e969df43374b0c223f66f79b69329bb8 \
     && ~/debian_build.sh ~/debian_dir_creator.sh
 ```
 

packaged_releases/docker/Dockerfile

@@ -5,8 +5,8 @@
 
 FROM python:3.5.2-alpine
 
-ENV CLI_VERSION 0.2.6
-ENV CLI_DOWNLOAD_SHA256 d2a6abae2a64a0262a9ab97170cb280a67656f3f82837dbb8b42c0f9737f0049
+ENV CLI_VERSION 0.2.7
+ENV CLI_DOWNLOAD_SHA256 66882e5ca6ae78aa4d99bc3440ceaf42e969df43374b0c223f66f79b69329bb8
 
 # Metadata as defined at http://label-schema.org
 ARG BUILD_DATE

packaged_releases/pip_requirements/0.2.7_python27.txt

@@ -0,0 +1,109 @@
+adal==0.4.5
+applicationinsights==0.10.0
+argcomplete==1.8.2
+asn1crypto==0.22.0
+azure-batch==2.0.1
+azure-cli==2.0.5
+azure-cli-acr==2.0.3
+azure-cli-acs==2.0.5
+azure-cli-appservice==0.1.5
+azure-cli-batch==2.0.3
+azure-cli-cdn==0.0.1
+azure-cli-cloud==2.0.2
+azure-cli-cognitiveservices==0.1.1
+azure-cli-command-modules-nspkg==2.0.0
+azure-cli-component==2.0.3
+azure-cli-configure==2.0.5
+azure-cli-core==2.0.5
+azure-cli-dla==0.0.5
+azure-cli-dls==0.0.5
+azure-cli-documentdb==0.1.5
+azure-cli-feedback==2.0.2
+azure-cli-find==0.2.2
+azure-cli-interactive==0.3.0
+azure-cli-iot==0.1.5
+azure-cli-keyvault==2.0.3
+azure-cli-lab==0.0.4
+azure-cli-monitor==0.0.3
+azure-cli-network==2.0.5
+azure-cli-nspkg==3.0.0
+azure-cli-profile==2.0.4
+azure-cli-redis==0.2.2
+azure-cli-resource==2.0.5
+azure-cli-role==2.0.3
+azure-cli-sf==1.0.0
+azure-cli-sql==2.0.2
+azure-cli-storage==2.0.5
+azure-cli-vm==2.0.5
+azure-common==1.1.5
+azure-datalake-store==0.0.8
+azure-graphrbac==0.30.0rc6
+azure-keyvault==0.2.0
+azure-mgmt-authorization==0.30.0rc6
+azure-mgmt-batch==3.0.1
+azure-mgmt-cdn==0.30.2
+azure-mgmt-cognitiveservices==1.0.0
+azure-mgmt-compute==1.0.0rc1
+azure-mgmt-containerregistry==0.2.1
+azure-mgmt-datalake-analytics==0.1.4
+azure-mgmt-datalake-nspkg==2.0.0
+azure-mgmt-datalake-store==0.1.4
+azure-mgmt-devtestlabs==2.0.0
+azure-mgmt-dns==1.0.1
+azure-mgmt-documentdb==0.1.3
+azure-mgmt-iothub==0.2.2
+azure-mgmt-keyvault==0.31.0
+azure-mgmt-monitor==0.2.1
+azure-mgmt-network==1.0.0rc3
+azure-mgmt-nspkg==2.0.0
+azure-mgmt-redis==1.0.0
+azure-mgmt-resource==1.0.0rc3
+azure-mgmt-sql==0.4.0
+azure-mgmt-storage==1.0.0rc1
+azure-mgmt-trafficmanager==0.30.0
+azure-mgmt-web==0.32.0
+azure-monitor==0.3.0
+azure-multiapi-storage==0.1.0
+azure-nspkg==2.0.0
+azure-servicefabric==5.6.130
+certifi==2017.4.17
+cffi==1.10.0
+colorama==0.3.9
+cryptography==1.8.1
+enum34==1.1.6
+futures==3.1.1
+idna==2.5
+ipaddress==1.0.18
+isodate==0.5.4
+jmespath==0.9.2
+keyring==10.3.2
+msrest==0.4.7
+msrestazure==0.4.7
+ndg-httpsclient==0.4.2
+oauthlib==2.0.2
+packaging==16.8
+paramiko==2.1.2
+pathlib2==2.2.1
+prompt-toolkit==1.0.14
+pyasn1==0.2.3
+pycparser==2.17
+pydocumentdb==2.1.0
+Pygments==2.2.0
+PyJWT==1.5.0
+pyOpenSSL==17.0.0
+pyparsing==2.2.0
+python-dateutil==2.6.0
+PyYAML==3.12
+requests==2.13.0
+requests-oauthlib==0.8.0
+scandir==1.5
+scp==0.10.2
+SecretStorage==2.3.1
+six==1.10.0
+sshtunnel==0.1.2
+tabulate==0.7.7
+urllib3==1.16
+vsts-cd-manager==0.117.5
+wcwidth==0.1.7
+Whoosh==2.7.4
+xmltodict==0.11.0

packaged_releases/pip_requirements/0.2.7_python35.txt

@@ -0,0 +1,104 @@
+adal==0.4.5
+applicationinsights==0.10.0
+argcomplete==1.8.2
+asn1crypto==0.22.0
+azure-batch==2.0.1
+azure-cli==2.0.5
+azure-cli-acr==2.0.3
+azure-cli-acs==2.0.5
+azure-cli-appservice==0.1.5
+azure-cli-batch==2.0.3
+azure-cli-cdn==0.0.1
+azure-cli-cloud==2.0.2
+azure-cli-cognitiveservices==0.1.1
+azure-cli-command-modules-nspkg==2.0.0
+azure-cli-component==2.0.3
+azure-cli-configure==2.0.5
+azure-cli-core==2.0.5
+azure-cli-dla==0.0.5
+azure-cli-dls==0.0.5
+azure-cli-documentdb==0.1.5
+azure-cli-feedback==2.0.2
+azure-cli-find==0.2.2
+azure-cli-interactive==0.3.0
+azure-cli-iot==0.1.5
+azure-cli-keyvault==2.0.3
+azure-cli-lab==0.0.4
+azure-cli-monitor==0.0.3
+azure-cli-network==2.0.5
+azure-cli-nspkg==3.0.0
+azure-cli-profile==2.0.4
+azure-cli-redis==0.2.2
+azure-cli-resource==2.0.5
+azure-cli-role==2.0.3
+azure-cli-sf==1.0.0
+azure-cli-sql==2.0.2
+azure-cli-storage==2.0.5
+azure-cli-vm==2.0.5
+azure-common==1.1.4
+azure-datalake-store==0.0.8
+azure-graphrbac==0.30.0rc6
+azure-keyvault==0.2.0
+azure-mgmt-authorization==0.30.0rc6
+azure-mgmt-batch==3.0.1
+azure-mgmt-cdn==0.30.2
+azure-mgmt-cognitiveservices==1.0.0
+azure-mgmt-compute==1.0.0rc1
+azure-mgmt-containerregistry==0.2.1
+azure-mgmt-datalake-analytics==0.1.4
+azure-mgmt-datalake-nspkg==2.0.0
+azure-mgmt-datalake-store==0.1.4
+azure-mgmt-devtestlabs==2.0.0
+azure-mgmt-dns==1.0.1
+azure-mgmt-documentdb==0.1.3
+azure-mgmt-iothub==0.2.2
+azure-mgmt-keyvault==0.31.0
+azure-mgmt-monitor==0.2.1
+azure-mgmt-network==1.0.0rc3
+azure-mgmt-nspkg==2.0.0
+azure-mgmt-redis==1.0.0
+azure-mgmt-resource==1.0.0rc3
+azure-mgmt-sql==0.4.0
+azure-mgmt-storage==1.0.0rc1
+azure-mgmt-trafficmanager==0.30.0
+azure-mgmt-web==0.32.0
+azure-monitor==0.3.0
+azure-multiapi-storage==0.1.0
+azure-nspkg==2.0.0
+azure-servicefabric==5.6.130
+certifi==2017.4.17
+cffi==1.10.0
+colorama==0.3.9
+cryptography==1.8.1
+futures==3.1.1
+idna==2.5
+isodate==0.5.4
+jmespath==0.9.2
+keyring==10.3.2
+msrest==0.4.7
+msrestazure==0.4.7
+oauthlib==2.0.2
+packaging==16.8
+paramiko==2.1.2
+prompt-toolkit==1.0.14
+pyasn1==0.2.3
+pycparser==2.17
+pydocumentdb==2.1.0
+Pygments==2.2.0
+PyJWT==1.5.0
+pyOpenSSL==17.0.0
+pyparsing==2.2.0
+python-dateutil==2.6.0
+PyYAML==3.12
+requests==2.13.0
+requests-oauthlib==0.8.0
+scp==0.10.2
+SecretStorage==2.3.1
+six==1.10.0
+sshtunnel==0.1.2
+tabulate==0.7.7
+urllib3==1.16
+vsts-cd-manager==0.117.5
+wcwidth==0.1.7
+Whoosh==2.7.4
+xmltodict==0.11.0

requirements.txt

@@ -2,7 +2,6 @@ adal==0.4.3
 applicationinsights==0.10.0
 argcomplete==1.8.0
 colorama==0.3.7
-humanfriendly==2.4
 jmespath
 mock==1.3.0
 paramiko==2.0.2

scripts/automation/coverage/run.py

@@ -8,10 +8,9 @@
 import os.path
 import sys
 
-from azure.cli.core.test_utils.vcr_test_base import COMMAND_COVERAGE_CONTROL_ENV
-
 import automation.tests.nose_helper as automation_tests
 import automation.utilities.path as automation_path
+from azure.cli.testsdk.vcr_test_base import COMMAND_COVERAGE_CONTROL_ENV
 
 
 # pylint: disable=too-few-public-methods

src/azure-cli-core/HISTORY.rst

@@ -2,7 +2,8 @@
 
 Release History
 ===============
-2.0.5 (Unreleased)
+
+2.0.5 (2017-05-05)
 ^^^^^^^^^^^^^^^^^^
 * core: capture exceptions caused by unregistered provider and auto-register it   
 * login: avoid the bad exception when the user account has no subscription and no tenants

src/azure-cli-core/azure/cli/core/__init__.py

@@ -3,4 +3,4 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-__version__ = "2.0.4+dev"
+__version__ = "2.0.5+dev"

src/azure-cli-core/azure/cli/core/application.py

@@ -15,7 +15,6 @@
 import azure.cli.core.azlogging as azlogging
 from azure.cli.core.util import todict, truncate_text, CLIError, read_file_content
 from azure.cli.core._config import az_config
-import azure.cli.core.commands.progress as progress
 
 import azure.cli.core.telemetry as telemetry
 
@@ -128,11 +127,6 @@ def __init__(self, configuration=None):
 
         self.parser = AzCliCommandParser(prog='az', parents=[self.global_parser])
         self.configuration = configuration
-        self.progress_controller = progress.ProgressHook()
-
-    def get_progress_controller(self):
-        self.progress_controller.init_progress(progress.get_progress_view())
-        return self.progress_controller
 
     def initialize(self, configuration):
         self.configuration = configuration