From 20cd7a9a27b3cacc96588bebdd797b3e7455f63b Mon Sep 17 00:00:00 2001 From: amsoedal Date: Mon, 25 Mar 2019 13:44:59 -0700 Subject: [PATCH 1/7] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c87ec866a66..033ba05d517 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -32,7 +32,7 @@ /src/db-up/ @williexu -/src/dev-spaces-preview/ @saurabsa +/src/dev-spaces-preview/ @amsoedal /src/dms-preview/ @temandr From 87731db8b9591b722c7d5c7ef1aa9fd81ea08fa2 Mon Sep 17 00:00:00 2001 From: Michelle Soedal Date: Thu, 4 Apr 2019 15:46:59 -0700 Subject: [PATCH 2/7] initial pass of removing preview keyword --- .github/CODEOWNERS | 2 +- azure-cli-extensions.pyproj | 16 ++++++++-------- .../azext_dev_spaces_preview/azext_metadata.json | 4 ---- .../azext_dev_spaces}/__init__.py | 6 +++--- .../azext_dev_spaces}/_help.py | 2 +- .../azext_dev_spaces/azext_metadata.json | 3 +++ .../azext_dev_spaces}/custom.py | 4 ++-- src/{dev-spaces-preview => dev-spaces}/readme.md | 4 ++-- src/{dev-spaces-preview => dev-spaces}/setup.cfg | 0 src/{dev-spaces-preview => dev-spaces}/setup.py | 4 ++-- 10 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 src/dev-spaces-preview/azext_dev_spaces_preview/azext_metadata.json rename src/{dev-spaces-preview/azext_dev_spaces_preview => dev-spaces/azext_dev_spaces}/__init__.py (81%) rename src/{dev-spaces-preview/azext_dev_spaces_preview => dev-spaces/azext_dev_spaces}/_help.py (89%) create mode 100644 src/dev-spaces/azext_dev_spaces/azext_metadata.json rename src/{dev-spaces-preview/azext_dev_spaces_preview => dev-spaces/azext_dev_spaces}/custom.py (97%) rename src/{dev-spaces-preview => dev-spaces}/readme.md (54%) rename src/{dev-spaces-preview => dev-spaces}/setup.cfg (100%) rename src/{dev-spaces-preview => dev-spaces}/setup.py (94%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 033ba05d517..92e3d420074 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -32,7 +32,7 @@ /src/db-up/ @williexu -/src/dev-spaces-preview/ @amsoedal +/src/dev-spaces/ @amsoedal /src/dms-preview/ @temandr diff --git a/azure-cli-extensions.pyproj b/azure-cli-extensions.pyproj index 4dedb62765a..ff1bcb163c8 100644 --- a/azure-cli-extensions.pyproj +++ b/azure-cli-extensions.pyproj @@ -750,10 +750,10 @@ - - - - + + + + @@ -4752,8 +4752,8 @@ - - + + @@ -4814,8 +4814,8 @@ - - + + diff --git a/src/dev-spaces-preview/azext_dev_spaces_preview/azext_metadata.json b/src/dev-spaces-preview/azext_dev_spaces_preview/azext_metadata.json deleted file mode 100644 index 391858872b6..00000000000 --- a/src/dev-spaces-preview/azext_dev_spaces_preview/azext_metadata.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "azext.minCliCoreVersion": "2.0.32", - "azext.isPreview": true -} \ No newline at end of file diff --git a/src/dev-spaces-preview/azext_dev_spaces_preview/__init__.py b/src/dev-spaces/azext_dev_spaces/__init__.py similarity index 81% rename from src/dev-spaces-preview/azext_dev_spaces_preview/__init__.py rename to src/dev-spaces/azext_dev_spaces/__init__.py index f9965993844..97829ca1aaf 100644 --- a/src/dev-spaces-preview/azext_dev_spaces_preview/__init__.py +++ b/src/dev-spaces/azext_dev_spaces/__init__.py @@ -5,8 +5,8 @@ from azure.cli.core import AzCommandsLoader -import azext_dev_spaces_preview._help # pylint: disable=unused-import -import azext_dev_spaces_preview.custom # pylint: disable=unused-import +import azext_dev_spaces._help # pylint: disable=unused-import +import azext_dev_spaces.custom # pylint: disable=unused-import class DevspacesExtCommandLoader(AzCommandsLoader): # pylint:disable=too-few-public-methods @@ -14,7 +14,7 @@ class DevspacesExtCommandLoader(AzCommandsLoader): # pylint:disable=too-few-pub def __init__(self, cli_ctx=None): from azure.cli.core.commands import CliCommandType dev_spaces_custom = CliCommandType( - operations_tmpl='azext_dev_spaces_preview.custom#{}') + operations_tmpl='azext_dev_spaces.custom#{}') super(DevspacesExtCommandLoader, self).__init__(cli_ctx=cli_ctx, custom_command_type=dev_spaces_custom, min_profile='2017-03-10-profile') diff --git a/src/dev-spaces-preview/azext_dev_spaces_preview/_help.py b/src/dev-spaces/azext_dev_spaces/_help.py similarity index 89% rename from src/dev-spaces-preview/azext_dev_spaces_preview/_help.py rename to src/dev-spaces/azext_dev_spaces/_help.py index b1dd52b6e04..05f21497314 100644 --- a/src/dev-spaces-preview/azext_dev_spaces_preview/_help.py +++ b/src/dev-spaces/azext_dev_spaces/_help.py @@ -10,5 +10,5 @@ helps['ads'] = """ type: group - short-summary: (PREVIEW) Manage Azure Dev Spaces. + short-summary: Manage Azure Dev Spaces. """ diff --git a/src/dev-spaces/azext_dev_spaces/azext_metadata.json b/src/dev-spaces/azext_dev_spaces/azext_metadata.json new file mode 100644 index 00000000000..16b2b1ba2d9 --- /dev/null +++ b/src/dev-spaces/azext_dev_spaces/azext_metadata.json @@ -0,0 +1,3 @@ +{ + "azext.minCliCoreVersion": "2.0.32" +} \ No newline at end of file diff --git a/src/dev-spaces-preview/azext_dev_spaces_preview/custom.py b/src/dev-spaces/azext_dev_spaces/custom.py similarity index 97% rename from src/dev-spaces-preview/azext_dev_spaces_preview/custom.py rename to src/dev-spaces/azext_dev_spaces/custom.py index ccffd63adce..ba3c76e3854 100644 --- a/src/dev-spaces-preview/azext_dev_spaces_preview/custom.py +++ b/src/dev-spaces/azext_dev_spaces/custom.py @@ -96,7 +96,7 @@ def _install_dev_spaces_cli(force_install): # Dev Spaces Install Path (WinX) azds_cli = os.path.join(os.environ["ProgramW6432"], "Microsoft SDKs", "Azure", - "Azure Dev Spaces CLI (Preview)", "azds.exe") + "Azure Dev Spaces CLI", "azds.exe") setup_file = os.path.join(_create_tmp_dir(), 'azds-winx-setup.exe') setup_url = "https://aka.ms/get-azds-windows-az" setup_args = [setup_file] @@ -119,7 +119,7 @@ def _install_dev_spaces_cli(force_install): if should_install_azds: # Install AZDS - logger.warning('Installing Dev Spaces (Preview) commands...') + logger.warning('Installing Dev Spaces commands...') if system == 'Windows': logger.warning('A separate window will open to guide you through the installation process.') diff --git a/src/dev-spaces-preview/readme.md b/src/dev-spaces/readme.md similarity index 54% rename from src/dev-spaces-preview/readme.md rename to src/dev-spaces/readme.md index d5879719bda..f4b680a665e 100644 --- a/src/dev-spaces-preview/readme.md +++ b/src/dev-spaces/readme.md @@ -1,10 +1,10 @@ -# Azure CLI Dev Spaces Preview Extension # +# Azure CLI Dev Spaces Extension # This is a extension for dev spaces features. ## How to use ## First, install the extension: ``` -az extension add --name dev-spaces-preview +az extension add --name dev-spaces ``` ``` \ No newline at end of file diff --git a/src/dev-spaces-preview/setup.cfg b/src/dev-spaces/setup.cfg similarity index 100% rename from src/dev-spaces-preview/setup.cfg rename to src/dev-spaces/setup.cfg diff --git a/src/dev-spaces-preview/setup.py b/src/dev-spaces/setup.py similarity index 94% rename from src/dev-spaces-preview/setup.py rename to src/dev-spaces/setup.py index ca2b48cea6d..c8dab5cb26a 100644 --- a/src/dev-spaces-preview/setup.py +++ b/src/dev-spaces/setup.py @@ -26,7 +26,7 @@ DEPENDENCIES = [] setup( - name='dev-spaces-preview', + name='dev-spaces', version=VERSION, description='Dev Spaces provides a rapid, iterative Kubernetes development experience for teams.', long_description='Iteratively develop and debug containers in a Azure Kubernetes Service cluster using Dev Spaces. \ @@ -38,7 +38,7 @@ author_email='azds-azcli@microsoft.com', url='https://github.com/Azure/azure-cli-extensions', classifiers=CLASSIFIERS, - package_data={'azext_dev_spaces_preview': ['azext_metadata.json']}, + package_data={'azext_dev_spaces': ['azext_metadata.json']}, packages=find_packages(exclude=["tests"]), install_requires=DEPENDENCIES ) From b86456f036764eb6cbeb3408ada47f287d7edab7 Mon Sep 17 00:00:00 2001 From: Michelle Soedal Date: Wed, 10 Apr 2019 13:39:30 -0700 Subject: [PATCH 3/7] update index.json --- src/dev-spaces/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dev-spaces/setup.py b/src/dev-spaces/setup.py index c8dab5cb26a..b2cb8098b3f 100644 --- a/src/dev-spaces/setup.py +++ b/src/dev-spaces/setup.py @@ -7,7 +7,7 @@ from setuptools import setup, find_packages -VERSION = "0.1.6" +VERSION = "1.0.0" CLASSIFIERS = [ 'Development Status :: 4 - Beta', From da88a7980bc24022ef9ba22946969ff2f4b4e981 Mon Sep 17 00:00:00 2001 From: Michelle Soedal Date: Wed, 10 Apr 2019 13:51:13 -0700 Subject: [PATCH 4/7] update index.json (and check it in this time) --- src/index.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/index.json b/src/index.json index fd5a1c7edb1..9f25d06c9cf 100644 --- a/src/index.json +++ b/src/index.json @@ -710,12 +710,11 @@ "sha256Digest": "dea3381583260d23fb875e4caf52686d21c33b701a11f984d5f4a18f763a875a" } ], - "dev-spaces-preview": [ + "dev-spaces": [ { - "downloadUrl": "https://azuredevspacestools.blob.core.windows.net/azdssetup/LKS/dev_spaces_preview-0.1.6-py2.py3-none-any.whl", - "filename": "dev_spaces_preview-0.1.6-py2.py3-none-any.whl", + "downloadUrl": "https://azuredevspacestools.blob.core.windows.net/azdssetup/LKS/dev_spaces-1.0.0-py2.py3-none-any.whl", + "filename": "dev_spaces-1.0.0-py2.py3-none-any.whl", "metadata": { - "azext.isPreview": true, "azext.minCliCoreVersion": "2.0.32", "classifiers": [ "Development Status :: 4 - Beta", @@ -750,11 +749,11 @@ "generator": "bdist_wheel (0.30.0)", "license": "MIT", "metadata_version": "2.0", - "name": "dev-spaces-preview", + "name": "dev-spaces", "summary": "Dev Spaces provides a rapid, iterative Kubernetes development experience for teams.", - "version": "0.1.6" + "version": "1.0.0" }, - "sha256Digest": "cd0fc8a0f684b561e53c1deb235b3cfa85ef7a4df5f52d67cec6dcba5a9494ae" + "sha256Digest": "cfd998abb0eff2a089aed07bd0c0fe9d226c85ba569b1365e3f94d0c2f9c33a5" } ], "dms-preview": [ From 201d87214177875e2737e6799d210ed16458add0 Mon Sep 17 00:00:00 2001 From: Michelle Soedal Date: Wed, 10 Apr 2019 15:42:42 -0700 Subject: [PATCH 5/7] remove help for non-existent command group --- src/dev-spaces/azext_dev_spaces/_help.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/dev-spaces/azext_dev_spaces/_help.py b/src/dev-spaces/azext_dev_spaces/_help.py index 05f21497314..cf6114ac82e 100644 --- a/src/dev-spaces/azext_dev_spaces/_help.py +++ b/src/dev-spaces/azext_dev_spaces/_help.py @@ -4,11 +4,3 @@ # -------------------------------------------------------------------------------------------- from knack.help_files import helps # pylint: disable=import-error - - -# ADS command help - -helps['ads'] = """ - type: group - short-summary: Manage Azure Dev Spaces. -""" From 965e7f60916e5c1c616cc27e5c85c88f42dab2d7 Mon Sep 17 00:00:00 2001 From: Michelle Soedal Date: Wed, 10 Apr 2019 16:29:44 -0700 Subject: [PATCH 6/7] remove unused import --- src/dev-spaces/azext_dev_spaces/_help.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/dev-spaces/azext_dev_spaces/_help.py b/src/dev-spaces/azext_dev_spaces/_help.py index cf6114ac82e..34913fb394d 100644 --- a/src/dev-spaces/azext_dev_spaces/_help.py +++ b/src/dev-spaces/azext_dev_spaces/_help.py @@ -2,5 +2,3 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- - -from knack.help_files import helps # pylint: disable=import-error From d86fb29c1e8a4da1e34869df92ad9fde51ba9bd5 Mon Sep 17 00:00:00 2001 From: Michelle Soedal Date: Wed, 10 Apr 2019 16:53:04 -0700 Subject: [PATCH 7/7] update index.json --- src/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.json b/src/index.json index 9f25d06c9cf..7428ff8c75a 100644 --- a/src/index.json +++ b/src/index.json @@ -753,7 +753,7 @@ "summary": "Dev Spaces provides a rapid, iterative Kubernetes development experience for teams.", "version": "1.0.0" }, - "sha256Digest": "cfd998abb0eff2a089aed07bd0c0fe9d226c85ba569b1365e3f94d0c2f9c33a5" + "sha256Digest": "d6336308305746718893d4e88089b083ebb0f7f82e74f71c98bf40acbc804ccb" } ], "dms-preview": [