Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/templates/steps/auth-dev-feed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ steps:
displayName: 'Pip Authenticate to feed'
inputs:
artifactFeeds: $(DevFeedName)
onlyAddExtraIndex: true
onlyAddExtraIndex: false
3 changes: 3 additions & 0 deletions eng/tox/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this just working around the issue? Do we still end up with 2 feeds given this one is the extra feed?

Copy link
Member Author

@scbedd scbedd Sep 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes.

I'm working on another commit that will actually check the package before installing from the feed. If it's a non-azure-sdk publisher, we will hard error out.

This will happen in create_package_and_install.py, the mechanism installs a target package (feed or otherwise).

deps = {[base]deps}
changedir = {toxinidir}
install_command = python -m pip install {opts} {packages} --cache-dir {toxinidir}/../.tox_pip_cache_{envname}
Expand Down Expand Up @@ -225,6 +226,7 @@ changedir =
{toxinidir}
passenv = *
setenv =
{[testenv]setenv}
DEPENDENCY_TYPE=Latest
commands =
{[deptestcommands]commands}
Expand All @@ -240,6 +242,7 @@ deps =
changedir = {toxinidir}
passenv = *
setenv =
{[testenv]setenv}
DEPENDENCY_TYPE=Minimum
commands =
{[deptestcommands]commands}
Expand Down
2 changes: 1 addition & 1 deletion scripts/devops_tasks/common_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion scripts/devops_tasks/test_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down