azdev 0.1.63__tar.gz → 0.1.65__tar.gz

{azdev-0.1.63 → azdev-0.1.65}/HISTORY.rst

@@ -2,6 +2,14 @@
 
 Release History
 ===============
+0.1.65
+++++++
+* `azdev command-change meta-diff`: Add diff support for deprecate_info in subgroup, cmd, parameters and options.
+
+0.1.64
+++++++
+* `azdev extension cal-next-version`: Fix module name when querying extension modules from index.
+
 0.1.63
 ++++++
 * `azdev`: Update required version for `azure-cli-diff-tool`.

{azdev-0.1.63/azdev.egg-info → azdev-0.1.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azdev
-Version: 0.1.63
+Version: 0.1.65
 Summary: Microsoft Azure CLI Developer Tools
 Home-page: https://github.com/Azure/azure-cli-dev-tools
 Author: Microsoft Corporation
@@ -36,7 +36,7 @@ Requires-Dist: sphinx==1.6.7
 Requires-Dist: tox
 Requires-Dist: jsbeautifier~=1.14.7
 Requires-Dist: deepdiff~=6.3.0
-Requires-Dist: azure-cli-diff-tool~=0.0.5
+Requires-Dist: azure-cli-diff-tool~=0.0.6
 Requires-Dist: packaging
 Requires-Dist: tqdm
 Requires-Dist: wheel==0.30.0
@@ -145,6 +145,14 @@ License
 
 Release History
 ===============
+0.1.65
+++++++
+* `azdev command-change meta-diff`: Add diff support for deprecate_info in subgroup, cmd, parameters and options.
+
+0.1.64
+++++++
+* `azdev extension cal-next-version`: Fix module name when querying extension modules from index.
+
 0.1.63
 ++++++
 * `azdev`: Update required version for `azure-cli-diff-tool`.

{azdev-0.1.63 → azdev-0.1.65}/azdev/__init__.py

@@ -4,4 +4,4 @@
 # license information.
 # -----------------------------------------------------------------------------
 
-__VERSION__ = '0.1.63'
+__VERSION__ = '0.1.65'

{azdev-0.1.63 → azdev-0.1.65}/azdev/operations/command_change/__init__.py

@@ -4,14 +4,14 @@
 # license information.
 # -----------------------------------------------------------------------------
 
-# pylint: disable=no-else-return
+# pylint: disable=no-else-return, too-many-nested-blocks
 
 import time
 
 from knack.log import get_logger
 import azure_cli_diff_tool
 from azdev.utilities import display, require_azure_cli, heading, get_path_table, filter_by_git_diff
-from .custom import DiffExportFormat, get_commands_meta
+from .custom import DiffExportFormat, get_commands_meta, STORED_DEPRECATION_KEY
 from .util import export_commands_meta
 from ..statistics import _create_invoker_and_load_cmds, _get_command_source, \
     _command_codegen_info  # pylint: disable=protected-access
@@ -92,6 +92,14 @@ def export_command_meta(modules=None, git_source=None, git_target=None, git_repo
             "supports_no_wait": command.supports_no_wait,
             "is_preview": command.command_kwargs.get("is_preview", False)
         }
+
+        if hasattr(command, "deprecate_info"):
+            for info_key in STORED_DEPRECATION_KEY:
+                if hasattr(command.deprecate_info, info_key) and getattr(command.deprecate_info, info_key):
+                    if command_info.get("deprecate_info", None) is None:
+                        command_info["deprecate_info"] = {}
+                    command_info["deprecate_info"][info_key] = getattr(command.deprecate_info, info_key)
+
         module_loader = command_loader.cmd_to_loader_map[command_name]
         for loader in module_loader:
             loader.skip_applicability = True

{azdev-0.1.63 → azdev-0.1.65}/azdev/operations/command_change/custom.py

@@ -11,6 +11,8 @@ from .util import get_command_tree
 
 logger = get_logger(__name__)
 
+STORED_DEPRECATION_KEY = ["expiration", "target", "redirect", "hide"]
+
 
 class DiffExportFormat(Enum):
     DICT = "dict"
@@ -52,6 +54,35 @@ def process_arg_options(argument_settings, para):
     para["options"] = sorted(option_list)
 
 
+def process_arg_options_deprecation(argument_settings, para):
+    if not argument_settings.get("options_list", None):
+        return
+    raw_options_list = argument_settings["options_list"]
+    option_deprecation_list = []
+    for opt in raw_options_list:
+        opt_type = opt.__class__.__name__
+        if opt_type != "Deprecated":
+            continue
+        opt_deprecation = {}
+        for info_key in STORED_DEPRECATION_KEY:
+            if hasattr(opt, info_key) and getattr(opt, info_key):
+                opt_deprecation[info_key] = getattr(opt, info_key)
+        option_deprecation_list.append(opt_deprecation)
+    if len(option_deprecation_list) != 0:
+        para["options_deprecate_info"] = option_deprecation_list
+
+
+def process_arg_deprecation(argument_settings, para):
+    if argument_settings.get("deprecate_info", None) is None:
+        return
+    for info_key in STORED_DEPRECATION_KEY:
+        if hasattr(argument_settings["deprecate_info"], info_key) and \
+                getattr(argument_settings["deprecate_info"], info_key):
+            if para.get("deprecate_info", None) is None:
+                para["deprecate_info"] = {}
+            para["deprecate_info"][info_key] = getattr(argument_settings["deprecate_info"], info_key)
+
+
 def process_arg_type(argument_settings, para):
     if not argument_settings.get("type", None):
         return
@@ -89,13 +120,13 @@ def normalize_para_types(para):
 
 
 def gen_command_meta(command_info, with_help=False, with_example=False):
-    stored_property_when_exist = ["confirmation", "supports_no_wait", "is_preview"]
+    stored_property_when_exist = ["confirmation", "supports_no_wait", "is_preview", "deprecate_info"]
     command_meta = {
         "name": command_info["name"],
         "is_aaz": command_info["is_aaz"],
     }
     for prop in stored_property_when_exist:
-        if command_info[prop]:
+        if command_info.get(prop, None):
             command_meta[prop] = command_info[prop]
     if with_example:
         try:
@@ -120,7 +151,9 @@ def gen_command_meta(command_info, with_help=False, with_example=False):
         para = {
             "name": settings["dest"],
         }
+        process_arg_deprecation(settings, para)
         process_arg_options(settings, para)
+        process_arg_options_deprecation(settings, para)
         process_arg_type(settings, para)
         if settings.get("required", False):
             para["required"] = True
@@ -145,6 +178,19 @@ def gen_command_meta(command_info, with_help=False, with_example=False):
     return command_meta
 
 
+def process_command_group_deprecation(command_group_obj, command_group_info):
+    if not hasattr(command_group_obj, "group_kwargs"):
+        return
+    group_kwargs = getattr(command_group_obj, "group_kwargs")
+    if group_kwargs.get("deprecate_info", None) is None:
+        return
+    for info_key in STORED_DEPRECATION_KEY:
+        if hasattr(group_kwargs["deprecate_info"], info_key) and getattr(group_kwargs["deprecate_info"], info_key):
+            if command_group_info.get("deprecate_info", None) is None:
+                command_group_info["deprecate_info"] = {}
+            command_group_info["deprecate_info"][info_key] = getattr(group_kwargs["deprecate_info"], info_key)
+
+
 def get_commands_meta(command_group_table, commands_info, with_help, with_example):
     commands_meta = {}
 
@@ -172,6 +218,7 @@ def get_commands_meta(command_group_table, commands_info, with_help, with_exampl
                         "commands": {},
                         "sub_groups": {}
                     }
+                    process_command_group_deprecation(group_info, command_group_info["sub_groups"][group_name])
                     if with_help:
                         try:
                             command_group_info["sub_groups"][group_name]["desc"] = group_info.help["short-summary"]

{azdev-0.1.63 → azdev-0.1.65}/azdev/operations/extensions/version_upgrade.py

@@ -5,7 +5,7 @@
 # -----------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
-# NOTE: The version uodate rules in this doc is complied with the doc below
+# NOTE: The version update rules in this doc comply with the doc below
 # https://github.com/Azure/azure-cli/blob/release/doc/extensions/versioning_guidelines.md
 
 from packaging.version import parse
@@ -56,7 +56,7 @@ class VersionUpgradeMod:
             self.version = parse(current_version)
         except Exception as e:
             raise ValueError("Invalid version: {0} cause {1}".format(current_version, str(e)))
-        self.is_preview = bool(is_preview or is_experimental or (self.version.pre and self.version.pre in ["a", "b"]))
+        self.is_preview = bool(is_preview or is_experimental or (self.version.pre and self.version.pre[0] in ["a", "b"]))
         self.has_preview_tag = is_preview
         self.has_exp_tag = is_experimental
         self.version_raw = current_version
@@ -92,7 +92,7 @@ class VersionUpgradeMod:
     def init_version_pre_tag(self):
         """
         use next version pre tag if user inputs
-        otherwise, consistant with the preview tag
+        otherwise, consistent with the preview tag
         """
         if self.next_version_pre_tag is not None:
             return
@@ -187,9 +187,11 @@ class VersionUpgradeMod:
             if self.module_name not in extension_data["extensions"]:
                 return
             has_stable, max_stable_major = self.find_max_version(
-                extension_data["extensions"][self.base_meta_file["module_name"]])
+                extension_data["extensions"][self.module_name])
             if has_stable:
                 self.last_stable_major = max_stable_major
+            else:
+                self.last_stable_major = 0
         except Exception as e:
             raise ValueError(str(e))
 

{azdev-0.1.63 → azdev-0.1.65}/azdev/operations/regex.py

@@ -88,16 +88,17 @@ def search_argument_context(row_num, lines):
     cmds = []
     while row_num > 0:
         row_num -= 1
-        # Match `with self.argument_context('') as c:`
-        sub_pattern0 = r'with self.argument_context\(\'(.*?)\'[\),]'
+        # Match `with self.argument_context(['"]['"]) as c:`
+        sub_pattern0 = r'with self.argument_context\([\'\"](.*?)[\'\"][\),]'
         # Match `with self.argument_context(scope) as c:`
         sub_pattern1 = r'with self.argument_context\(scope[\),]'
-        # Match `with self.argument_context(\'{} stop\'.format(scope)) as c:',
-        sub_pattern2 = r'with self.argument_context\(\'(.*)\'.format\(scope\)\)'
+        # Match `with self.argument_context(['"]{} stop['"].format(scope)) as c:',
+        sub_pattern2 = r'with self.argument_context\([\'\"](.*)[\'\"].format\(scope\)\)'
+        # There are many matching patterns, but their proportion is very small. Ignore these commands.
         ref0 = re.findall(sub_pattern0, lines[row_num])
         ref1 = re.findall(sub_pattern1, lines[row_num])
         ref2 = re.findall(sub_pattern2, lines[row_num])
-        # Match `with self.argument_context('') as c:`
+        # Match `with self.argument_context(['"]['"]) as c:`
         if ref0:
             cmds = ref0
             break
@@ -107,7 +108,7 @@ def search_argument_context(row_num, lines):
             cmds = json.loads(
                 re.findall(sub_pattern, lines[row_num - 1])[0].replace('\'', '"'))
             break
-        # Match `with self.argument_context(\'{} stop\'.format(scope)) as c:',
+        # Match `with self.argument_context(['"]{} stop['"].format(scope)) as c:',
         if ref2:
             sub_pattern = r'for scope in (.*):'
             format_strings = json.loads(

{azdev-0.1.63 → azdev-0.1.65}/azdev/operations/style.py

@@ -192,16 +192,15 @@ def _run_pep8(modules):
 
 
 def _config_file_path(style_type="pylint"):
-    cli_repo_path = get_azdev_config().get("cli", "repo_path")
-
-    ext_repo_path = filter(
-        lambda x: "azure-cli-extension" in x,
-        get_azdev_config().get("ext", "repo_paths").split(),
-    )
+    from configparser import NoSectionError
+    try:
+        cli_repo_path = get_azdev_config().get("cli", "repo_path")
+    except NoSectionError:
+        cli_repo_path = None
     try:
-        ext_repo_path = next(ext_repo_path)
-    except StopIteration:
-        ext_repo_path = []
+        ext_repo_path = get_azdev_config().get("ext", "repo_paths").split(',')[0]
+    except NoSectionError:
+        ext_repo_path = None
 
     if style_type not in ["pylint", "flake8"]:
         raise ValueError("style_tyle value allows only: pylint, flake8.")

{azdev-0.1.63 → azdev-0.1.65}/azdev/operations/testtool/profile_context.py

@@ -4,6 +4,7 @@
 # license information.
 # -----------------------------------------------------------------------------
 
+import os
 import traceback
 
 from knack.log import get_logger
@@ -14,6 +15,7 @@ from azdev.utilities import display
 
 
 logger = get_logger(__name__)
+os.environ['AZURE_CORE_COLLECT_TELEMETRY'] = 'False'
 
 
 class ProfileContext:

{azdev-0.1.63 → azdev-0.1.65/azdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azdev
-Version: 0.1.63
+Version: 0.1.65
 Summary: Microsoft Azure CLI Developer Tools
 Home-page: https://github.com/Azure/azure-cli-dev-tools
 Author: Microsoft Corporation
@@ -36,7 +36,7 @@ Requires-Dist: sphinx==1.6.7
 Requires-Dist: tox
 Requires-Dist: jsbeautifier~=1.14.7
 Requires-Dist: deepdiff~=6.3.0
-Requires-Dist: azure-cli-diff-tool~=0.0.5
+Requires-Dist: azure-cli-diff-tool~=0.0.6
 Requires-Dist: packaging
 Requires-Dist: tqdm
 Requires-Dist: wheel==0.30.0
@@ -145,6 +145,14 @@ License
 
 Release History
 ===============
+0.1.65
+++++++
+* `azdev command-change meta-diff`: Add diff support for deprecate_info in subgroup, cmd, parameters and options.
+
+0.1.64
+++++++
+* `azdev extension cal-next-version`: Fix module name when querying extension modules from index.
+
 0.1.63
 ++++++
 * `azdev`: Update required version for `azure-cli-diff-tool`.

{azdev-0.1.63 → azdev-0.1.65}/azdev.egg-info/requires.txt

@@ -14,7 +14,7 @@ sphinx==1.6.7
 tox
 jsbeautifier~=1.14.7
 deepdiff~=6.3.0
-azure-cli-diff-tool~=0.0.5
+azure-cli-diff-tool~=0.0.6
 packaging
 tqdm
 wheel==0.30.0

{azdev-0.1.63 → azdev-0.1.65}/setup.py

@@ -82,7 +82,7 @@ setup(
         'tox',
         'jsbeautifier~=1.14.7',
         'deepdiff~=6.3.0',
-        'azure-cli-diff-tool~=0.0.5',
+        'azure-cli-diff-tool~=0.0.6',
         'packaging',
         'tqdm',
         'wheel==0.30.0'