From 68ed63f258340de98db4a5f2cf36104a3c1dcedb Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 26 Jan 2021 18:18:23 -0800 Subject: [PATCH 1/2] converge management documentation generation to the same methodology in preperation for deleting generate_doc.py --- eng/tox/run_sphinx_apidoc.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/tox/run_sphinx_apidoc.py b/eng/tox/run_sphinx_apidoc.py index c23146846438..1c0542d96d2c 100644 --- a/eng/tox/run_sphinx_apidoc.py +++ b/eng/tox/run_sphinx_apidoc.py @@ -120,9 +120,6 @@ def mgmt_apidoc(working_directory, namespace): pkg_name, namespace, pkg_version = get_package_details(os.path.join(package_dir, 'setup.py')) if should_build_docs(pkg_name): - if is_mgmt_package(pkg_name): - mgmt_apidoc(output_directory, namespace) - else: - sphinx_apidoc(args.working_directory) + sphinx_apidoc(args.working_directory) else: logging.info("Skipping sphinx source generation for {}".format(pkg_name)) \ No newline at end of file From 8bf55dca486a1e4299c58094c5002103414d818c Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 26 Jan 2021 18:20:00 -0800 Subject: [PATCH 2/2] missed cleanup on a couple items --- eng/tox/run_sphinx_apidoc.py | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/eng/tox/run_sphinx_apidoc.py b/eng/tox/run_sphinx_apidoc.py index 1c0542d96d2c..0a4fc19d00bd 100644 --- a/eng/tox/run_sphinx_apidoc.py +++ b/eng/tox/run_sphinx_apidoc.py @@ -20,10 +20,6 @@ logging.getLogger().setLevel(logging.INFO) root_dir = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..")) -generate_mgmt_script = os.path.join(root_dir, "doc/sphinx/generate_doc.py") - -def is_mgmt_package(package_dir): - return "mgmt" in pkg_name or "cognitiveservices" in pkg_name def copy_existing_docs(source, target): for file in os.listdir(source): @@ -65,31 +61,6 @@ def sphinx_apidoc(working_directory): ) exit(1) -def mgmt_apidoc(working_directory, namespace): - command_array = [ - sys.executable, - generate_mgmt_script, - "-p", - namespace, - "-o", - working_directory, - "--verbose" - ] - - try: - logging.info("Command to generate management sphinx sources: {}".format(command_array)) - - check_call( - command_array - ) - except CalledProcessError as e: - logging.error( - "script failed for path {} exited with error {}".format( - args.working_directory, e.returncode - ) - ) - exit(1) - if __name__ == "__main__": parser = argparse.ArgumentParser( description="Run sphinx-apidoc against target folder. Handles management generation if necessary."