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.

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

Remove 'preview' from Dev Spaces #638

Merged
merged 13 commits into from
Apr 17, 2019
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

/src/db-up/ @yugangw-msft

/src/dev-spaces-preview/ @amsoedal
/src/dev-spaces/ @amsoedal

/src/dms-preview/ @temandr

Expand Down
16 changes: 8 additions & 8 deletions azure-cli-extensions.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -750,10 +750,10 @@
<Compile Include="src\botservice\azext_bot\_params.py" />
<Compile Include="src\botservice\azext_bot\__init__.py" />
<Compile Include="src\botservice\setup.py" />
<Compile Include="src\dev-spaces-preview\azext_dev_spaces_preview\custom.py" />
<Compile Include="src\dev-spaces-preview\azext_dev_spaces_preview\_help.py" />
<Compile Include="src\dev-spaces-preview\azext_dev_spaces_preview\__init__.py" />
<Compile Include="src\dev-spaces-preview\setup.py" />
<Compile Include="src\dev-spaces\azext_dev_spaces\custom.py" />
<Compile Include="src\dev-spaces\azext_dev_spaces\_help.py" />
<Compile Include="src\dev-spaces\azext_dev_spaces\__init__.py" />
<Compile Include="src\dev-spaces\setup.py" />
<Compile Include="src\dms-preview\azext_dms\commands.py" />
<Compile Include="src\dms-preview\azext_dms\custom.py" />
<Compile Include="src\dms-preview\azext_dms\scenario_inputs.py" />
Expand Down Expand Up @@ -4760,8 +4760,8 @@
<Content Include="src\botservice\azext_bot\azext_metadata.json" />
<Content Include="src\botservice\HISTORY.rst" />
<Content Include="src\botservice\README.rst" />
<Content Include="src\dev-spaces-preview\azext_dev_spaces_preview\azext_metadata.json" />
<Content Include="src\dev-spaces-preview\readme.md" />
<Content Include="src\dev-spaces\azext_dev_spaces\azext_metadata.json" />
<Content Include="src\dev-spaces\readme.md" />
<Content Include="src\dms-preview\azext_dms\azext_metadata.json" />
<Content Include="src\dms-preview\README.rst" />
<Content Include="src\eventgrid\azext_eventgrid\azext_metadata.json" />
Expand Down Expand Up @@ -4822,8 +4822,8 @@
<Folder Include="src\azure-firewall\azext_firewall\vendored_sdks\v2018_08_01\operations" />
<Folder Include="src\botservice" />
<Folder Include="src\botservice\azext_bot" />
<Folder Include="src\dev-spaces-preview" />
<Folder Include="src\dev-spaces-preview\azext_dev_spaces_preview" />
<Folder Include="src\dev-spaces" />
<Folder Include="src\dev-spaces\azext_dev_spaces" />
<Folder Include="src\dms-preview" />
<Folder Include="src\dms-preview\azext_dms" />
<Folder Include="src\dms-preview\azext_dms\vendored_sdks" />
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

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

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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +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


# ADS command help

helps['ads'] = """
type: group
short-summary: (PREVIEW) Manage Azure Dev Spaces.
"""
3 changes: 3 additions & 0 deletions src/dev-spaces/azext_dev_spaces/azext_metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"azext.minCliCoreVersion": "2.0.32"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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.')

Expand Down
4 changes: 2 additions & 2 deletions src/dev-spaces-preview/readme.md → src/dev-spaces/readme.md
Original file line number Diff line number Diff line change
@@ -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
```

```
File renamed without changes.
6 changes: 3 additions & 3 deletions src/dev-spaces-preview/setup.py → src/dev-spaces/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from setuptools import setup, find_packages

VERSION = "0.1.6"
VERSION = "1.0.0"

CLASSIFIERS = [
'Development Status :: 4 - Beta',
Expand All @@ -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. \
Expand All @@ -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
)
13 changes: 6 additions & 7 deletions src/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -742,12 +742,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",
Expand Down Expand Up @@ -782,11 +781,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": "d6336308305746718893d4e88089b083ebb0f7f82e74f71c98bf40acbc804ccb"
}
],
"dms-preview": [
Expand Down