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/3] 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 eb7196d842bf7f9b8f7d9181cade24d23d6e8c26 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Feb 2021 13:38:35 -0800 Subject: [PATCH 2/3] ensure I pass the package as an array of length one, versus a string which can be treated as an array --- .gitignore | 1 + build_package.py | 5 +++-- scripts/devops_tasks/build_packages.py | 2 +- scripts/devops_tasks/test_regression.py | 6 +++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f0e48e65805d..0fe206db7138 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ build/ # Test results TestResults/ +ENV_DIR/ # tox generated artifacts test-junit-*.xml diff --git a/build_package.py b/build_package.py index cb0064c33d7a..b8d964826792 100644 --- a/build_package.py +++ b/build_package.py @@ -9,6 +9,7 @@ import argparse import os import glob +import sys from subprocess import check_call @@ -19,8 +20,8 @@ def create_package(name, dest_folder=DEFAULT_DEST_FOLDER): absdirs = [os.path.dirname(package) for package in (glob.glob('{}/setup.py'.format(name)) + glob.glob('sdk/*/{}/setup.py'.format(name)))] absdirpath = os.path.abspath(absdirs[0]) - check_call(['python', 'setup.py', 'bdist_wheel', '-d', dest_folder], cwd=absdirpath) - check_call(['python', 'setup.py', "sdist", "--format", "zip", '-d', dest_folder], cwd=absdirpath) + check_call([sys.executable, 'setup.py', 'bdist_wheel', '-d', dest_folder], cwd=absdirpath) + check_call([sys.executable, 'setup.py', "sdist", "--format", "zip", '-d', dest_folder], cwd=absdirpath) if __name__ == '__main__': diff --git a/scripts/devops_tasks/build_packages.py b/scripts/devops_tasks/build_packages.py index 3a8d221935b5..cc85c0df6f14 100644 --- a/scripts/devops_tasks/build_packages.py +++ b/scripts/devops_tasks/build_packages.py @@ -31,7 +31,7 @@ def build_packages(targeted_packages, distribution_directory, is_dev_build=False print("Generating Package Using Python {}".format(sys.version)) run_check_call( [ - "python", + sys.executable, build_packing_script_location, "--dest", distribution_directory, diff --git a/scripts/devops_tasks/test_regression.py b/scripts/devops_tasks/test_regression.py index 1c69c07cc0a0..044de110532d 100644 --- a/scripts/devops_tasks/test_regression.py +++ b/scripts/devops_tasks/test_regression.py @@ -225,7 +225,7 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude): working_dir = self.context.package_root_path temp_dir = self.context.temp_path - list_to_exclude = [pkg_to_exclude,] + list_to_exclude = [pkg_to_exclude, 'azure-sdk-tools', ] installed_pkgs = [p.split('==')[0] for p in get_installed_packages(self.context.venv.lib_paths) if p.startswith('azure-')] logging.info("Installed azure sdk packages:{}".format(installed_pkgs)) @@ -253,6 +253,10 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude): logging.info("Not extending dev requirements {} {}".format(filtered_dev_req_path, self.context.is_latest_depend_test)) if filtered_dev_req_path: + logging.info("Extending dev requirement to include azure-sdk-tools") + extend_dev_requirements( + filtered_dev_req_path, ["../../../tools/azure-sdk-tools"] + ) logging.info( "Installing filtered dev requirements from {}".format(filtered_dev_req_path) ) From 807869c5c494d45d06c19a1fa80fb53176cd5d0c Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 1 Feb 2021 13:44:58 -0800 Subject: [PATCH 3/3] undo a commit that was previously accidentally added to local master --- eng/tox/run_sphinx_apidoc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/tox/run_sphinx_apidoc.py b/eng/tox/run_sphinx_apidoc.py index 1c0542d96d2c..c23146846438 100644 --- a/eng/tox/run_sphinx_apidoc.py +++ b/eng/tox/run_sphinx_apidoc.py @@ -120,6 +120,9 @@ 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): - sphinx_apidoc(args.working_directory) + if is_mgmt_package(pkg_name): + mgmt_apidoc(output_directory, namespace) + else: + sphinx_apidoc(args.working_directory) else: logging.info("Skipping sphinx source generation for {}".format(pkg_name)) \ No newline at end of file