From 77820ae728d3df52b05a906991d4d0dd6988d2da Mon Sep 17 00:00:00 2001 From: Scott Beddall <45376673+scbedd@users.noreply.github.com> Date: Tue, 28 Sep 2021 17:30:17 -0700 Subject: [PATCH] Resolving Build Warnings (#20887) * pip authenticate supplants pypi, doesn't supplement anymore * leave dev feeds enabled, still fallback to main pypi.org --- eng/pipelines/templates/steps/auth-dev-feed.yml | 2 +- eng/tox/tox.ini | 3 +++ scripts/devops_tasks/common_tasks.py | 2 +- scripts/devops_tasks/test_regression.py | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/steps/auth-dev-feed.yml b/eng/pipelines/templates/steps/auth-dev-feed.yml index 1935e30932a9..88ae9b122114 100644 --- a/eng/pipelines/templates/steps/auth-dev-feed.yml +++ b/eng/pipelines/templates/steps/auth-dev-feed.yml @@ -23,4 +23,4 @@ steps: displayName: 'Pip Authenticate to feed' inputs: artifactFeeds: $(DevFeedName) - onlyAddExtraIndex: true \ No newline at end of file + onlyAddExtraIndex: false \ No newline at end of file diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini index 289f55c6911c..6532abee42cf 100644 --- a/eng/tox/tox.ini +++ b/eng/tox/tox.ini @@ -43,6 +43,7 @@ platform = linux: linux passenv = * setenv = SPHINX_APIDOC_OPTIONS=members,undoc-members,inherited-members + PIP_EXTRA_INDEX_URL=https://pypi.python.org/simple deps = {[base]deps} changedir = {toxinidir} install_command = python -m pip install {opts} {packages} --cache-dir {toxinidir}/../.tox_pip_cache_{envname} @@ -225,6 +226,7 @@ changedir = {toxinidir} passenv = * setenv = + {[testenv]setenv} DEPENDENCY_TYPE=Latest commands = {[deptestcommands]commands} @@ -240,6 +242,7 @@ deps = changedir = {toxinidir} passenv = * setenv = + {[testenv]setenv} DEPENDENCY_TYPE=Minimum commands = {[deptestcommands]commands} diff --git a/scripts/devops_tasks/common_tasks.py b/scripts/devops_tasks/common_tasks.py index f7704eb97bb7..60ffe3b69f36 100644 --- a/scripts/devops_tasks/common_tasks.py +++ b/scripts/devops_tasks/common_tasks.py @@ -383,7 +383,7 @@ def find_whl(package_name, version, whl_directory): def install_package_from_whl( package_whl_path, working_dir, python_sym_link=sys.executable ): - commands = [python_sym_link, "-m", "pip", "install", package_whl_path] + commands = [python_sym_link, "-m", "pip", "install", package_whl_path, "--extra-index", "https://pypi.python.org/simple"] run_check_call(commands, working_dir) logging.info("Installed package from {}".format(package_whl_path)) diff --git a/scripts/devops_tasks/test_regression.py b/scripts/devops_tasks/test_regression.py index 8c9491a01efd..69908135fd82 100644 --- a/scripts/devops_tasks/test_regression.py +++ b/scripts/devops_tasks/test_regression.py @@ -274,7 +274,7 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude): "Installing filtered dev requirements from {}".format(filtered_dev_req_path) ) run_check_call( - [python_executable, "-m", "pip", "install", "-r", filtered_dev_req_path], + [python_executable, "-m", "pip", "install", "-r", filtered_dev_req_path, "--extra-index", "https://pypi.org/simple"], dependent_pkg_path, ) else: