diff --git a/scripts/ci/build_ext_cmd_tree.sh b/scripts/ci/build_ext_cmd_tree.sh index bc8552d1c91..53bed033b85 100644 --- a/scripts/ci/build_ext_cmd_tree.sh +++ b/scripts/ci/build_ext_cmd_tree.sh @@ -20,15 +20,7 @@ export AZURE_EXTENSION_INDEX_URL=https://raw.githubusercontent.com/Azure/azure-c output=$(az extension list-available --query [].name -otsv) # azure-cli-ml is replaced by ml # disable alias which relies on Jinja2 2.10 -# ----------------------------------------------- -# When two extensions have the same command, the following error will be reported: -# `Exception: Key: show already exists in containerapp. 2 extensions cannot have the same command!` -# Temporarily skip the containerapp-preview extension, -# Which will cause the containerapp-preview extension to be unable to use the dynamic load function. -# That is, when using the unique command of containerapp-preview, the extension cannot be automatically prompted to install. -# TODO: remove this after support for building dependencies in command index between extensions -# ----------------------------------------------- -blocklist=("azure-cli-ml" "alias" "containerapp-preview") +blocklist=("azure-cli-ml" "alias") rm -f ~/.azure/extCmdTreeToUpload.json diff --git a/scripts/ci/index_ref_doc.py b/scripts/ci/index_ref_doc.py index 910685f0b2d..63589122d34 100644 --- a/scripts/ci/index_ref_doc.py +++ b/scripts/ci/index_ref_doc.py @@ -50,20 +50,14 @@ class TestIndexRefDocsMeta(type): def __new__(mcs, name, bases, _dict): - def gen_test(ext_name, ext_url, filename, dep_url): + def gen_test(ext_name, ext_url, filename): def test(self): - if dep_url.get(ext_name): - dep_file = get_whl_from_url(dep_url[ext_name][0], dep_url[ext_name][1], self.whl_dir) - else: - dep_file = None ext_file = get_whl_from_url(ext_url, filename, self.whl_dir) ref_doc_out_dir = os.path.join(REF_DOC_OUT_DIR, ext_name) if not os.path.isdir(ref_doc_out_dir): os.mkdir(ref_doc_out_dir) script_args = [sys.executable, REF_GEN_SCRIPT, '--extension-file', ext_file, '--output-dir', ref_doc_out_dir] - if dep_file: - script_args.extend(['--dependent-file', dep_file]) try: check_call(script_args) except CalledProcessError as e: @@ -71,14 +65,9 @@ def test(self): raise e return test - dep_url = {} for ext_name, ext_url, filename in ALL_TESTS: test_name = "test_ref_doc_%s" % ext_name - # The containerapp-preview extension is a special case, - # it must depend on the continerapp extension and cannot run independently. - if ext_name == 'containerapp': - dep_url['containerapp-preview'] = [ext_url, filename] - _dict[test_name] = gen_test(ext_name, ext_url, filename, dep_url) + _dict[test_name] = gen_test(ext_name, ext_url, filename) return type.__new__(mcs, name, bases, _dict) diff --git a/scripts/ci/verify_linter.py b/scripts/ci/verify_linter.py index ebe6f3100d9..7fee6294307 100644 --- a/scripts/ci/verify_linter.py +++ b/scripts/ci/verify_linter.py @@ -70,17 +70,9 @@ def _cmd(cmd): check_call(cmd, shell=True) def add_from_code(self): - # The containerapp-preview extension is a special case, - # it must depend on the continerapp extension and cannot run independently. - if self.extension_name == 'containerapp-preview': - self._cmd('azdev extension add containerapp') self._cmd('azdev extension add {}'.format(self.extension_name)) def remove(self): - # The containerapp-preview extension is a special case, - # it must depend on the continerapp extension and cannot run independently. - if self.extension_name == 'containerapp-preview': - self._cmd('azdev extension remove containerapp') self._cmd('azdev extension remove {}'.format(self.extension_name)) def linter(self): diff --git a/scripts/refdoc/generate.py b/scripts/refdoc/generate.py index 18211d22632..ae5778ae142 100644 --- a/scripts/refdoc/generate.py +++ b/scripts/refdoc/generate.py @@ -21,7 +21,7 @@ def print_status(msg=''): print('-- '+msg) -def generate(ext_file, output_dir, dep_file): +def generate(ext_file, output_dir): # Verify sphinx installed in environment before we get started check_call(['sphinx-build', '--version']) if not output_dir: @@ -29,12 +29,6 @@ def generate(ext_file, output_dir, dep_file): print_status('Using output directory {}'.format(output_dir)) temp_extension_dir = tempfile.mkdtemp() try: - if dep_file: - pip_cmd = [sys.executable, '-m', 'pip', 'install', '--target', - os.path.join(temp_extension_dir, 'extension'), - dep_file, '--disable-pip-version-check', '--no-cache-dir'] - print_status('Executing "{}"'.format(' '.join(pip_cmd))) - check_call(pip_cmd) pip_cmd = [sys.executable, '-m', 'pip', 'install', '--target', os.path.join(temp_extension_dir, 'extension'), ext_file, '--disable-pip-version-check', '--no-cache-dir'] print_status('Executing "{}"'.format(' '.join(pip_cmd))) @@ -81,7 +75,6 @@ def _type_path(val): help='Path to the extension .whl file.', required=True, type=_type_ext_file) parser.add_argument('-o', '--output-dir', dest='output_dir', help='Path to place the generated documentation. By default, a temporary directory will be created.', required=False, type=_type_path) - parser.add_argument('-d', '--dependent-file', dest='dep_file', - help='Path to the dependent extension .whl file.', required=False, type=str) + args = parser.parse_args() - generate(args.ext_file, args.output_dir, args.dep_file) + generate(args.ext_file, args.output_dir)