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) )