minor fix

Author: wangzelin007

azdev/operations/extensions/metadata.py

@@ -296,7 +296,8 @@ def pkginfo_to_dict(path, distribution=None):
 
     # convert entry points to exports
     try:
-        ep_map = entry_points()
+        with open(os.path.join(os.path.dirname(path), "entry_points.txt"), "r"):
+            ep_map = entry_points()
         exports = OrderedDict()
         # exports = defaultdict()
         for group, items in sorted(ep_map.items()):

azdev/operations/setup.py

@@ -49,7 +49,8 @@ def _install_extensions(ext_paths):
 
     # install specified extensions
     for path in ext_paths or []:
-        result = pip_cmd('install -e {}'.format(path), "Adding extension '{}'...".format(path))
+        result = pip_cmd('install -e {} --config-settings editable_mode=compat'.format(path),
+                          "Adding extension '{}'...".format(path))
         if result.error:
             raise result.error  # pylint: disable=raising-bad-type
 
@@ -90,46 +91,48 @@ def _install_cli(cli_path, deps=None):
         # Resolve dependencies from setup.py files.
         # command modules have dependency on azure-cli-core so install this first
         pip_cmd(
-            "install -e {}".format(os.path.join(cli_src, 'azure-cli-telemetry')),
+            "install -e {} --config-settings editable_mode=compat".format(os.path.join(cli_src, 'azure-cli-telemetry')),
             "Installing `azure-cli-telemetry`..."
         )
         pip_cmd(
-            "install -e {}".format(os.path.join(cli_src, 'azure-cli-core')),
+            "install -e {} --config-settings editable_mode=compat".format(os.path.join(cli_src, 'azure-cli-core')),
             "Installing `azure-cli-core`..."
         )
 
         # azure cli has dependencies on the above packages so install this one last
         pip_cmd(
-            "install -e {}".format(os.path.join(cli_src, 'azure-cli')),
+            "install -e {} --config-settings editable_mode=compat".format(os.path.join(cli_src, 'azure-cli')),
             "Installing `azure-cli`..."
         )
 
         pip_cmd(
-            "install -e {}".format(os.path.join(cli_src, 'azure-cli-testsdk')),
+            "install -e {} --config-settings editable_mode=compat".format(os.path.join(cli_src, 'azure-cli-testsdk')),
             "Installing `azure-cli-testsdk`..."
         )
     else:
         # First install packages without dependencies,
         # then resolve dependencies from requirements.*.txt file.
         pip_cmd(
-            "install -e {} --no-deps".format(os.path.join(cli_src, 'azure-cli-telemetry')),
+            "install -e {} --no-deps --config-settings editable_mode=compat".format(
+                os.path.join(cli_src, 'azure-cli-telemetry')),
             "Installing `azure-cli-telemetry`..."
         )
         pip_cmd(
-            "install -e {} --no-deps".format(os.path.join(cli_src, 'azure-cli-core')),
+            "install -e {} --no-deps --config-settings editable_mode=compat".format(
+                os.path.join(cli_src, 'azure-cli-core')),
             "Installing `azure-cli-core`..."
         )
 
         pip_cmd(
-            "install -e {} --no-deps".format(os.path.join(cli_src, 'azure-cli')),
+            "install -e {} --no-deps --config-settings editable_mode=compat".format(os.path.join(cli_src, 'azure-cli')),
             "Installing `azure-cli`..."
         )
 
         # The dependencies of testsdk are not in requirements.txt as this package is not needed by the
         # azure-cli package for running commands.
         # Here we need to install with dependencies for azdev test.
         pip_cmd(
-            "install -e {}".format(os.path.join(cli_src, 'azure-cli-testsdk')),
+            "install -e {} --config-settings editable_mode=compat".format(os.path.join(cli_src, 'azure-cli-testsdk')),
             "Installing `azure-cli-testsdk`..."
         )
         import platform

azure-pipelines-cli.yml

@@ -103,6 +103,7 @@ jobs:
         azdev setup -c ./azure-cli -r ./azure-cli-extensions
 
         azdev --version
+        az --version
 
         python -m pytest azdev/ --ignore=azdev/mod_templates --junitxml=junit/test-results.xml --cov=azdev --cov-report=xml
     - task: PublishTestResults@2
@@ -280,6 +281,7 @@ jobs:
         set -ev
         . scripts/ci/install.sh
         azdev --version
+        az --version
       displayName: 'Azdev Setup'
     - bash: |
         set -ev

setup.py

@@ -86,7 +86,7 @@
         'azure-cli-diff-tool~=0.1.0',
         'packaging',
         'tqdm',
-        'setuptools',
+        'setuptools>=64.0.0',
         'microsoft-security-utilities-secret-masker~=1.0.0b4'
     ],
     package_data={