azdev 0.2.13__tar.gz → 0.2.14__tar.gz

{azdev-0.2.13 → azdev-0.2.14}/HISTORY.rst

@@ -2,6 +2,24 @@
 
 Release History
 ===============
+0.2.14
+++++++
+* `azdev extension add`/`list`/`build`: discover extensions by packaging configuration instead of globbing for `setup.py`, so extensions that have migrated to `pyproject.toml` are found. Previously a migrated extension was reported as `extension(s) not found`.
+* `azdev extension build`: build through the PEP 517 frontend for `pyproject.toml` extensions, keeping `setup.py bdist_wheel` for the rest. `--no-isolation` preserves the previous behaviour for extensions whose build imports their own `azext_*` package.
+* `azdev extension add`/`azdev setup`: generate `*.egg-info` without `setup.py`, so `az` can still discover a migrated extension as a development extension. `azure-cli-core` finds dev extensions by globbing `*.egg-info`.
+* `azdev extension create`: scaffold `pyproject.toml` instead of `setup.py` and `setup.cfg`.
+* `azdev extension update-index`: keep the home page under the `Home` label for `pyproject.toml` extensions, which declare `[project.urls] Homepage` rather than `url=`, so `index.json` entries do not change shape on migration. Also accept `License-Expression` in place of `License`.
+* `azdev extension build`: fix the build-failure handler reading `CommandResultItem.output`, which does not exist. A failed build raised `AttributeError` instead of showing the build log.
+* Migrate azdev and `azure-cli-diff-tool` to PEP 621 `pyproject.toml`. Both `setup.py` files are gone; wheel contents are unchanged.
+* Build with `python -m build` in CI, and check metadata with `twine check` instead of `setup.py check -r -s`.
+* Drop the `setuptools<80` cap. It guarded `setup.py develop`, which azdev stopped calling in 0.2.12. The `>=78.1.1` floor for CVE-2025-47273 stays.
+* Fix `azdev cli check-versions` running `python -m setup.py bdist_wheel`, which could never work.
+* Fix `azure-cli-diff-tool`'s sdist missing `HISTORY.rst`, which broke building a wheel from it.
+* Fix `scripts/ci/extract_version.sh` producing an empty version.
+* Set `Description-Content-Type` and stop reading the long description through `codecs.open`, which wrote `\r\r\n` line endings on Windows.
+* `azdev command-change meta-export`: record `action` for parameters that take no value. Flag actions are written as `store_true`, `store_false`, `store_const` or `count`, including preview, experimental and deprecated arguments, whose action knack wraps in a subclass. Other actions registered with `nargs=0`, such as the one for `--acquire-policy-token`, are written as `store_true`. Readers of the metadata can now tell a flag such as `--enable-fips` from an option that takes a value. Other parameters get no `action` key, and `meta-diff` doesn't compare it.
+* `azdev test`: cap `pytest` below 9.2. On Linux and macOS `azdev test` runs pytest with `--forked`, and pytest-forked 1.7.5 can't serialise pytest 9.2 reports, so every test failed with "EXITED with status 3". The cap stays until pytest-forked supports pytest 9.2 (pytest-dev/pytest-forked#113).
+
 0.2.13
 ++++++
 * `azdev extension add` / `azdev setup`: regenerate `*.egg-info` after the editable install so development extensions stay discoverable. `--no-build-isolation` (0.2.12) means pip no longer leaves an `*.egg-info` in the source tree, which made `azdev extension add` a silent no-op for discovery. (#554)

{azdev-0.2.13/azdev.egg-info → azdev-0.2.14}/PKG-INFO

@@ -1,17 +1,15 @@
 Metadata-Version: 2.4
 Name: azdev
-Version: 0.2.13
+Version: 0.2.14
 Summary: Microsoft Azure CLI Developer Tools
-Home-page: https://github.com/Azure/azure-cli-dev-tools
-Author: Microsoft Corporation
-Author-email: azpycli@microsoft.com
-License: MIT
+Author-email: Microsoft Corporation <azpycli@microsoft.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/Azure/azure-cli-dev-tools
 Keywords: azure
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -19,8 +17,10 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: azure-multiapi-storage
+Requires-Dist: build
 Requires-Dist: docutils
 Requires-Dist: flake8
 Requires-Dist: gitpython
@@ -29,7 +29,7 @@ Requires-Dist: knack
 Requires-Dist: pylint<5,>=4
 Requires-Dist: pytest-xdist
 Requires-Dist: pytest-forked
-Requires-Dist: pytest>=5.0.0
+Requires-Dist: pytest<9.2,>=5.0.0
 Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: sphinx==1.6.7
@@ -39,21 +39,12 @@ Requires-Dist: deepdiff~=8.6.1
 Requires-Dist: azure-cli-diff-tool~=0.1.1
 Requires-Dist: packaging
 Requires-Dist: pkginfo
+Requires-Dist: tomli; python_version < "3.11"
 Requires-Dist: tqdm
-Requires-Dist: setuptools<80,>=78.1.1
+Requires-Dist: setuptools>=78.1.1
 Requires-Dist: wheel
 Requires-Dist: microsoft-security-utilities-secret-masker~=1.0.0b4
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 Microsoft Azure CLI Dev Tools (azdev)
 =====================================
@@ -199,11 +190,28 @@ License
 
     THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.::
 
-
 .. :changelog:
 
 Release History
 ===============
+0.2.14
+++++++
+* `azdev extension add`/`list`/`build`: discover extensions by packaging configuration instead of globbing for `setup.py`, so extensions that have migrated to `pyproject.toml` are found. Previously a migrated extension was reported as `extension(s) not found`.
+* `azdev extension build`: build through the PEP 517 frontend for `pyproject.toml` extensions, keeping `setup.py bdist_wheel` for the rest. `--no-isolation` preserves the previous behaviour for extensions whose build imports their own `azext_*` package.
+* `azdev extension add`/`azdev setup`: generate `*.egg-info` without `setup.py`, so `az` can still discover a migrated extension as a development extension. `azure-cli-core` finds dev extensions by globbing `*.egg-info`.
+* `azdev extension create`: scaffold `pyproject.toml` instead of `setup.py` and `setup.cfg`.
+* `azdev extension update-index`: keep the home page under the `Home` label for `pyproject.toml` extensions, which declare `[project.urls] Homepage` rather than `url=`, so `index.json` entries do not change shape on migration. Also accept `License-Expression` in place of `License`.
+* `azdev extension build`: fix the build-failure handler reading `CommandResultItem.output`, which does not exist. A failed build raised `AttributeError` instead of showing the build log.
+* Migrate azdev and `azure-cli-diff-tool` to PEP 621 `pyproject.toml`. Both `setup.py` files are gone; wheel contents are unchanged.
+* Build with `python -m build` in CI, and check metadata with `twine check` instead of `setup.py check -r -s`.
+* Drop the `setuptools<80` cap. It guarded `setup.py develop`, which azdev stopped calling in 0.2.12. The `>=78.1.1` floor for CVE-2025-47273 stays.
+* Fix `azdev cli check-versions` running `python -m setup.py bdist_wheel`, which could never work.
+* Fix `azure-cli-diff-tool`'s sdist missing `HISTORY.rst`, which broke building a wheel from it.
+* Fix `scripts/ci/extract_version.sh` producing an empty version.
+* Set `Description-Content-Type` and stop reading the long description through `codecs.open`, which wrote `\r\r\n` line endings on Windows.
+* `azdev command-change meta-export`: record `action` for parameters that take no value. Flag actions are written as `store_true`, `store_false`, `store_const` or `count`, including preview, experimental and deprecated arguments, whose action knack wraps in a subclass. Other actions registered with `nargs=0`, such as the one for `--acquire-policy-token`, are written as `store_true`. Readers of the metadata can now tell a flag such as `--enable-fips` from an option that takes a value. Other parameters get no `action` key, and `meta-diff` doesn't compare it.
+* `azdev test`: cap `pytest` below 9.2. On Linux and macOS `azdev test` runs pytest with `--forked`, and pytest-forked 1.7.5 can't serialise pytest 9.2 reports, so every test failed with "EXITED with status 3". The cap stays until pytest-forked supports pytest 9.2 (pytest-dev/pytest-forked#113).
+
 0.2.13
 ++++++
 * `azdev extension add` / `azdev setup`: regenerate `*.egg-info` after the editable install so development extensions stay discoverable. `--no-build-isolation` (0.2.12) means pip no longer leaves an `*.egg-info` in the source tree, which made `azdev extension add` a silent no-op for discovery. (#554)

{azdev-0.2.13 → azdev-0.2.14}/azdev/__init__.py

@@ -4,4 +4,4 @@
 # license information.
 # -----------------------------------------------------------------------------
 
-__VERSION__ = '0.2.13'
+__VERSION__ = '0.2.14'

azdev-0.2.14/azdev/mod_templates/pyproject.toml

@@ -0,0 +1,49 @@
+[build-system]
+requires = ["setuptools>=70.1.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "{{ pkg_name }}"
+# TODO: Confirm this is the right version number you want and it matches your
+# HISTORY.rst entry.
+version = "0.1.0"
+description = "Microsoft Azure Command-Line Tools {{ display_name }} {{ 'Extension' if is_ext else 'Command Module' }}"
+# TODO: Update author and email, if applicable
+authors = [{ name = "Microsoft Corporation", email = "azpycli@microsoft.com" }]
+license = { text = "MIT" }
+# The full list of classifiers is available at
+# https://pypi.python.org/pypi?%3Aaction=list_classifiers
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Intended Audience :: System Administrators",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "License :: OSI Approved :: MIT License",
+]
+# TODO: Add any additional SDK dependencies here
+dependencies = {% if dependencies %}[
+    {{ dependencies|join(',\n    '|safe) }}
+]{% else %}[]{% endif %}
+# `readme` is the concatenation of README.rst and HISTORY.rst, which PEP 621
+# cannot express statically.
+dynamic = ["readme"]
+
+[project.urls]
+# TODO: change to your extension source code repo if the code will not be put in azure-cli-extensions repo
+Homepage = "https://github.com/Azure/{% if is_ext %}azure-cli-extensions/tree/main/src/{{ pkg_name }}{% else %}azure-cli{% endif %}"
+
+[tool.setuptools.dynamic]
+readme = { file = ["README.rst", "HISTORY.rst"], content-type = "text/x-rst" }
+
+[tool.setuptools.packages.find]
+where = ["."]
+exclude = ["tests*"]
+{% if is_ext %}
+[tool.setuptools.package-data]
+{{ ext_long_name }} = ["azext_metadata.json"]
+{% endif %}

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/cmdcov/__init__.py

@@ -21,8 +21,7 @@ logger = get_logger(__name__)
 try:
     with open(os.path.join(get_cli_repo_path(), 'scripts', 'ci', 'cmdcov.yml'), 'r') as file:
         config = yaml.safe_load(file)
-# pylint: disable=broad-exception-caught
-except Exception:
+except Exception:  # pylint: disable=broad-exception-caught
     url = "https://raw.githubusercontent.com/Azure/azure-cli/dev/scripts/ci/cmdcov.yml"
     response = requests.get(url)
     config = yaml.safe_load(response.text)

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/cmdcov/cmdcov.py

@@ -22,8 +22,7 @@ logger = get_logger(__name__)
 try:
     with open(os.path.join(get_cli_repo_path(), 'scripts', 'ci', 'cmdcov.yml'), 'r') as file:
         config = yaml.safe_load(file)
-# pylint: disable=broad-exception-caught
-except Exception:
+except Exception:  # pylint: disable=broad-exception-caught
     url = "https://raw.githubusercontent.com/Azure/azure-cli/dev/scripts/ci/cmdcov.yml"
     response = requests.get(url)
     config = yaml.safe_load(response.text)

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/code_gen.py

@@ -30,7 +30,6 @@ def _ensure_dir(path):
 
 
 def _generate_files(env, generation_kwargs, file_list, dest_path):
-
     # allow sending a single item
     if not isinstance(file_list, list):
         file_list = [file_list]
@@ -269,8 +268,7 @@ def _create_package(prefix, repo_path, is_ext, name='test', display_name=None, d
         root_files = [
             'HISTORY.rst',
             'README.rst',
-            'setup.cfg',
-            'setup.py'
+            'pyproject.toml'
         ]
         _generate_files(env, kwargs, root_files, dest_path)
 

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/command_change/__init__.py

@@ -10,8 +10,9 @@ 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 azdev.utilities import display, require_azure_cli, heading, filter_by_git_diff, \
     calc_selected_mod_names
+from azdev.utilities.path import calc_selected_modules
 from .custom import DiffExportFormat, get_commands_meta, STORED_DEPRECATION_KEY
 from .util import export_commands_meta, dump_command_tree, add_to_command_tree
 from ..statistics import _create_invoker_and_load_cmds, _get_command_source, \
@@ -32,19 +33,7 @@ def export_command_meta(modules=None, git_source=None, git_target=None, git_repo
                         meta_output_path=None):
     require_azure_cli()
 
-    # allow user to run only on CLI or extensions
-    cli_only = modules == ['CLI']
-    ext_only = modules == ['EXT']
-    if cli_only or ext_only:
-        modules = None
-
-    selected_modules = get_path_table(include_only=modules, include_whl_extensions=include_whl_extensions)
-
-    if cli_only:
-        selected_modules['ext'] = {}
-    if ext_only:
-        selected_modules['core'] = {}
-        selected_modules['mod'] = {}
+    selected_modules = calc_selected_modules(modules, include_whl_extensions=include_whl_extensions)
 
     # filter down to only modules that have changed based on git diff
     selected_modules = filter_by_git_diff(selected_modules, git_source, git_target, git_repo)

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/command_change/custom.py

@@ -4,6 +4,7 @@
 # license information.
 # -----------------------------------------------------------------------------
 
+import argparse
 from enum import Enum
 
 from knack.log import get_logger
@@ -13,6 +14,17 @@ logger = get_logger(__name__)
 
 STORED_DEPRECATION_KEY = ["expiration", "target", "redirect", "hide"]
 
+# actions that take no value, so a reader of the metadata can tell a flag from an option that needs one
+FLAG_ACTIONS = ["store_true", "store_false", "store_const", "count"]
+# knack wraps the action in a subclass for preview, experimental and deprecated arguments,
+# so match classes by base class, checking subclasses before their bases
+FLAG_ACTION_CLASSES = [
+    (argparse._StoreTrueAction, "store_true"),  # pylint: disable=protected-access
+    (argparse._StoreFalseAction, "store_false"),  # pylint: disable=protected-access
+    (argparse._StoreConstAction, "store_const"),  # pylint: disable=protected-access
+    (argparse._CountAction, "count"),  # pylint: disable=protected-access
+]
+
 
 class DiffExportFormat(Enum):
     DICT = "dict"
@@ -98,6 +110,21 @@ def process_arg_type(argument_settings, para):
     para["type"] = raw_type if raw_type in ["str", "int", "float", "bool", "file_type"] else "custom_type"
 
 
+def process_arg_action(argument_settings, para):
+    action = argument_settings.get("action", None)
+    if isinstance(action, str):
+        if action in FLAG_ACTIONS:
+            para["action"] = action
+    elif isinstance(action, type):
+        for action_class, action_name in FLAG_ACTION_CLASSES:
+            if issubclass(action, action_class):
+                para["action"] = action_name
+                break
+    # a custom action that takes no value, such as the one for --acquire-policy-token
+    if "action" not in para and argument_settings.get("nargs", None) == 0:
+        para["action"] = "store_true"
+
+
 def normalize_para_types(para):
     type_string_opts = ["string", "str", "aazstrarg",
                         "aazresourcelocationarg", "aazresourcegroupnamearg", "aazresourceidarg",
@@ -159,6 +186,7 @@ def gen_command_meta(command_info, with_help=False, with_example=False):
         process_arg_options(settings, para)
         process_arg_options_deprecation(settings, para)
         process_arg_type(settings, para)
+        process_arg_action(settings, para)
         if settings.get("required", False):
             para["required"] = True
         if settings.get("choices", None):

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/extensions/__init__.py

@@ -15,8 +15,9 @@ from knack.prompting import prompt_y_n
 from knack.util import CLIError
 
 from azdev.utilities import (
-    cmd, py_cmd, pip_cmd, display, get_ext_repo_paths, find_files, get_azure_config, get_azdev_config,
-    get_azure_config_dir, require_azure_cli, heading, subheading, quote_arg, EXTENSION_PREFIX)
+    cmd, pip_cmd, display, get_ext_repo_paths, find_files, get_azure_config, get_azdev_config,
+    get_azure_config_dir, require_azure_cli, heading, subheading, quote_arg, EXTENSION_PREFIX,
+    build_package_wheel, find_package_configs_recursive, generate_egg_info)
 from .version_upgrade import VersionUpgradeMod
 
 logger = get_logger(__name__)
@@ -56,12 +57,7 @@ def _ensure_egg_info(path):
     # extension is invisible even though pip succeeded. Regenerate it with the env's setuptools.
     if find_files(path, '*.egg-info'):
         return
-    result = py_cmd(
-        'setup.py egg_info',
-        "Generating metadata for '{}'...".format(path),
-        is_module=False,
-        cwd=path,
-    )
+    result = generate_egg_info(path, "Generating metadata for '{}'...".format(path))
     if result.error:
         raise result.error  # pylint: disable=raising-bad-type
 
@@ -71,7 +67,7 @@ def add_extension(extensions):
     ext_paths = get_ext_repo_paths()
     if not ext_paths or ext_paths == ['_NONE_']:
         raise CLIError('Extension repo path is empty. Please try `azdev extension repo add` to add an extension repo')
-    all_extensions = find_files(ext_paths, 'setup.py')
+    all_extensions = find_package_configs_recursive(ext_paths)
 
     if extensions == ['*']:
         paths_to_add = [os.path.dirname(path) for path in all_extensions
@@ -168,7 +164,7 @@ def list_extensions():
     installed_names = [x['name'] for x in installed]
     results = []
 
-    for ext_path in find_files(dev_sources, 'setup.py'):
+    for ext_path in find_package_configs_recursive(dev_sources):
         # skip non-extension packages that may be in the extension folder (for example, from a virtual environment)
         try:
             glob_pattern = os.path.join(os.path.split(ext_path)[0], '{}*'.format(EXTENSION_PREFIX))
@@ -301,9 +297,8 @@ def update_extension_index(extensions):
         except IndexError:
             raise CLIError('unable to parse extension name')
 
-        # TODO: Update this!
-        extensions_dir = tempfile.mkdtemp()
-        ext_dir = tempfile.mkdtemp(dir=extensions_dir)
+        # Create temporary directories for extraction and caching
+        ext_dir = tempfile.mkdtemp()
         whl_cache_dir = tempfile.mkdtemp()
         whl_cache = {}
         ext_file = get_whl_from_url(ext_path, ext_path.split("/")[-1], whl_cache_dir, whl_cache)
@@ -334,7 +329,7 @@ def build_extensions(extensions, dist_dir='dist'):
     ext_paths = get_ext_repo_paths()
     if not ext_paths or ext_paths == ['_NONE_']:
         raise CLIError('Extension repo path is empty. Please try `azdev extension repo add` to add an extension repo')
-    all_extensions = find_files(ext_paths, 'setup.py')
+    all_extensions = find_package_configs_recursive(ext_paths)
 
     paths_to_build = []
     for path in all_extensions:
@@ -347,22 +342,10 @@ def build_extensions(extensions, dist_dir='dist'):
     if extensions:
         raise CLIError('extension(s) not found: {}'.format(' '.join(extensions)))
 
-    original_cwd = os.getcwd()
-    dist_dir = os.path.join(original_cwd, dist_dir)
+    dist_dir = os.path.join(os.getcwd(), dist_dir)
     for path in paths_to_build:
-        os.chdir(path)
-        command = 'setup.py bdist_wheel -b bdist -d {}'.format(dist_dir)
-        result = py_cmd(command, "Building extension '{}'...".format(path), is_module=False)
-        if result.error:
-            # py_cmd captures the build output; surface it so the real setup.py failure is visible
-            # instead of only the opaque CalledProcessError.
-            build_output = result.output
-            if isinstance(build_output, (bytes, bytearray)):
-                build_output = build_output.decode('utf-8', 'ignore')
-            if build_output:
-                logger.error(build_output)
-            raise result.error  # pylint: disable=raising-bad-type
-    os.chdir(original_cwd)
+        display("Building extension '{}'...".format(path))
+        build_package_wheel(path, dist_dir)
 
 
 def publish_extensions(extensions, storage_account, storage_account_key, storage_container,

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/extensions/metadata.py

@@ -82,6 +82,7 @@ def read_pkginfo(wheel_path: Path) -> Dict[str, Any]:
         "description": whl.description,
         "description_content_type": whl.description_content_type,
         "license": whl.license,
+        "license_expression": getattr(whl, "license_expression", None),
         "classifiers": list(whl.classifiers or []),
         "requires_dist": list(whl.requires_dist or []),
         "requires_python": whl.requires_python,
@@ -149,13 +150,27 @@ def _coerce_run_requires(requires_dist: List[str]) -> List[Dict[str, Any]]:
 
 
 def _coerce_project_urls(project_urls: List[str], home_page: Optional[str]) -> Dict[str, str]:
+    """Build the `project_urls` block, normalizing the home page label.
+
+    A `setup.py` package declares `url=`, which lands in the `Home-page` METADATA
+    field and has always been stored in `index.json` under the `Home` label.
+    PEP 621 has no `url` equivalent: a pyproject package declares
+    `[project.urls] Homepage`, which lands in `Project-URL` instead. Both are
+    mapped to `Home` so an extension's index entry keeps its shape when it
+    migrates.
+    """
     out: Dict[str, str] = {}
     if home_page:
         out["Home"] = home_page
     for entry in project_urls or []:
-        if "," in entry:
-            label, url = entry.split(",", 1)
-            out[label.strip()] = url.strip()
+        if "," not in entry:
+            continue
+        label, url = entry.split(",", 1)
+        label, url = label.strip(), url.strip()
+        if label.lower() in ("home", "homepage", "home-page"):
+            out.setdefault("Home", url)
+            continue
+        out[label] = url
     return out
 
 
@@ -180,7 +195,9 @@ def merge_to_index_metadata(pkg: Dict[str, Any], azext: Dict[str, Any]) -> Dict[
     metadata["name"] = pkg.get("name")
     metadata["version"] = pkg.get("version")
     metadata["summary"] = pkg.get("summary")
-    metadata["license"] = pkg.get("license")
+    # PEP 639 wheels carry the license as `License-Expression` rather than
+    # `License`, so accept either and keep a single `license` key in the index.
+    metadata["license"] = pkg.get("license") or pkg.get("license_expression")
     metadata["metadata_version"] = pkg.get("metadata_version")
     metadata["classifiers"] = pkg.get("classifiers") or []
     metadata["extras"] = []

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/latest_index.py

@@ -17,10 +17,7 @@ _LATEST_INDEX_SCRIPT = os.path.join('scripts', 'generate_latest_indices.py')
 
 
 def _resolve_cli_repo_path(cli_path):
-    if cli_path:
-        resolved = os.path.abspath(os.path.expanduser(cli_path))
-    else:
-        resolved = get_cli_repo_path()
+    resolved = os.path.abspath(os.path.expanduser(cli_path)) if cli_path else get_cli_repo_path()
 
     if not resolved or resolved == '_NONE_':
         raise CLIError('Azure CLI repo path is not configured. Specify `--cli` or run `azdev setup`.')

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/pypi.py

@@ -7,6 +7,7 @@
 import os
 import re
 import sys
+import tempfile
 
 from docutils import core, io
 
@@ -14,16 +15,14 @@ from knack.log import get_logger
 from knack.util import CLIError
 
 from azdev.utilities import (
-    display, heading, subheading, cmd, py_cmd, get_path_table,
-    pip_cmd, COMMAND_MODULE_PREFIX, require_azure_cli, find_files)
+    build_package_wheel, display, heading, subheading, cmd, get_package_config,
+    get_path_table, pip_cmd, COMMAND_MODULE_PREFIX, require_azure_cli)
 
 logger = get_logger(__name__)
 
 
 HISTORY_NAME = 'HISTORY.rst'
 RELEASE_HISTORY_TITLE = 'Release History'
-SETUP_PY_NAME = 'setup.py'
-
 # modules which should not be included in setup.py
 # because they aren't on PyPI
 EXCLUDED_MODULES = ['azure-cli-testsdk']
@@ -59,7 +58,20 @@ def check_history():
     display('OK')
 
 
-def _check_history_headings(mod_path):
+def _get_built_package_metadata(mod_path):
+    from pkginfo import Wheel
+
+    with tempfile.TemporaryDirectory(prefix='azdev-package-metadata-') as output_dir:
+        wheel_path = build_package_wheel(mod_path, output_dir)
+        metadata = Wheel(wheel_path)
+        return {
+            'description': metadata.description,
+            'description_content_type': metadata.description_content_type,
+            'version': metadata.version,
+        }
+
+
+def _check_history_headings(mod_path, actual_version=None):
     history_path = os.path.join(mod_path, HISTORY_NAME)
 
     source_path = None
@@ -93,41 +105,57 @@ def _check_history_headings(mod_path):
                           "line after the 'Release History' heading.".format(history_path))
 
         first_version_history = all_versions[0]
-        actual_version = cmd(sys.executable + ' setup.py --version', cwd=mod_path)
-        # command can output warnings as well, so we just want the last line, which should have the version
-        actual_version = actual_version.result.splitlines()[-1].strip()
+        if actual_version is None:
+            actual_version_result = cmd(sys.executable + ' setup.py --version', cwd=mod_path)
+            # command can output warnings as well, so we just want the last line, which should have the version
+            actual_version = actual_version_result.result.splitlines()[-1].strip()
         if first_version_history != actual_version:
-            errors.append("The topmost version in {} does not match version {} defined in setup.py.".format(
+            errors.append("The topmost version in {} does not match package version {}.".format(
                 history_path, actual_version))
     return errors
 
 
 def _check_readme_render(mod_path):
     errors = []
-    result = cmd(sys.executable + ' setup.py check -r -s', cwd=mod_path)
-    if result.exit_code:
-        # this outputs some warnings we don't care about
-        error_lines = []
-        target_line = 'The following syntax errors were detected'
-        suppress = True
-        logger.debug(result.error.output)
-
-        # TODO: Checks for syntax errors but potentially not other things
-        for line in result.error.output.splitlines():
-            line = str(line).strip()
-            if not suppress and line:
-                error_lines.append(line)
-            if target_line in line:
-                suppress = False
-        errors.append(os.linesep.join(error_lines))
-    errors += _check_history_headings(mod_path)
+    package_config = get_package_config(mod_path)
+    if package_config and os.path.basename(package_config) == 'setup.py':
+        result = cmd(sys.executable + ' setup.py check -r -s', cwd=mod_path)
+        if result.exit_code:
+            # this outputs some warnings we don't care about
+            error_lines = []
+            target_line = 'The following syntax errors were detected'
+            suppress = True
+            logger.debug(result.error.output)
+
+            # TODO: Checks for syntax errors but potentially not other things
+            for line in result.error.output.splitlines():
+                line = str(line).strip()
+                if not suppress and line:
+                    error_lines.append(line)
+                if target_line in line:
+                    suppress = False
+            errors.append(os.linesep.join(error_lines))
+        errors += _check_history_headings(mod_path)
+        return errors
+
+    metadata = _get_built_package_metadata(mod_path)
+    content_type = (metadata.get('description_content_type') or 'text/x-rst').split(';', 1)[0].strip().lower()
+    if content_type == 'text/x-rst' and metadata.get('description'):
+        _, publication = core.publish_programmatically(
+            source_class=io.StringInput, source=metadata['description'],
+            source_path=None, destination_class=io.NullOutput, destination=None,
+            destination_path=None, reader=None, reader_name='standalone', parser=None,
+            parser_name='restructuredtext', writer=None, writer_name='null', settings=None,
+            settings_spec=None, settings_overrides={}, config_section=None, enable_exit_status=None)
+        if publication.writer.document.reporter.max_level >= 2:
+            errors.append('The package long description contains reStructuredText warnings or errors.')
+    errors += _check_history_headings(mod_path, actual_version=metadata['version'])
     return errors
 # endregion
 
 
 # region verify PyPI versions
 def verify_versions():
-    import tempfile
     import shutil
 
     require_azure_cli()
@@ -174,25 +202,6 @@ def verify_versions():
         display('OK!')
 
 
-def _get_module_versions(results, modules):
-
-    version_pattern = re.compile(r'.*(?P<ver>\d+.\d+.\d+).*')
-
-    for mod, mod_path in modules:
-        if not mod.startswith(COMMAND_MODULE_PREFIX) and mod != 'azure-cli':
-            mod = '{}{}'.format(COMMAND_MODULE_PREFIX, mod)
-
-        setup_path = find_files(mod_path, 'setup.py')
-        with open(setup_path[0], 'r') as f:
-            local_version = 'Unknown'
-            for line in f.readlines():
-                if line.strip().startswith('VERSION'):
-                    local_version = version_pattern.match(line).group('ver')
-                    break
-            results[mod]['local_version'] = local_version
-    return results
-
-
 # pylint: disable=too-many-statements
 def _compare_module_against_pypi(results, root_dir, mod, mod_path):
     import zipfile
@@ -230,10 +239,7 @@ def _compare_module_against_pypi(results, root_dir, mod, mod_path):
     # build from source and extract the version
     setup_path = os.path.normpath(mod_path.strip())
     os.chdir(setup_path)
-    py_cmd('setup.py bdist_wheel -d {}'.format(build_dir))
-    if len(os.listdir(build_dir)) != 1:
-        raise CLIError('Unexpectedly found multiple build files found in {}.'.format(build_dir))
-    build_path = os.path.join(build_dir, os.listdir(build_dir)[0])
+    build_path = build_package_wheel(setup_path, build_dir)
     build_version = version_pattern.match(build_path).group(1)
 
     results[mod].update({

{azdev-0.2.13 → azdev-0.2.14}/azdev/operations/regex.py

@@ -18,8 +18,7 @@ logger = get_logger(__name__)
 try:
     with open(os.path.join(get_cli_repo_path(), 'scripts', 'ci', 'cmdcov.yml'), 'r') as file:
         config = yaml.safe_load(file)
-# pylint: disable=broad-exception-caught
-except Exception:
+except Exception:  # pylint: disable=broad-exception-caught
     url = "https://raw.githubusercontent.com/Azure/azure-cli/dev/scripts/ci/cmdcov.yml"
     response = requests.get(url)
     config = yaml.safe_load(response.text)