Skip to content

Commit c2830fb

Browse files
committed
Revert "Run pip check at end of devstack"
This reverts commit 79b8e79. This is breaking things in various jobs, most notably because we do not put constraints on linters - but we install test-requirements which then can conflict with each other. Change-Id: Ibc5603c61b38ce44db58fb27a27352f59123ad09
1 parent c26dfb0 commit c2830fb

2 files changed

Lines changed: 0 additions & 27 deletions

File tree

inc/python

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -111,30 +111,6 @@ function disable_python3_package {
111111
$xtrace
112112
}
113113

114-
115-
function pip_check {
116-
time_start "pip_check"
117-
118-
if [[ -n ${PIP_VIRTUAL_ENV:=} && -d ${PIP_VIRTUAL_ENV} ]]; then
119-
local cmd_pip=$PIP_VIRTUAL_ENV/bin/pip
120-
else
121-
local cmd_pip
122-
if python3_enabled; then
123-
echo "Using python $PYTHON3_VERSION to check pip install because python3_enabled=True"
124-
cmd_pip=$(get_pip_command $PYTHON3_VERSION)
125-
else
126-
echo "Using python $PYTHON2_VERSION to check pip install because python3_enabled=False"
127-
cmd_pip=$(get_pip_command $PYTHON2_VERSION)
128-
fi
129-
fi
130-
131-
$cmd_pip check
132-
result=$?
133-
134-
time_stop "pip_check"
135-
return $result
136-
}
137-
138114
# Wrapper for ``pip install`` to set cache and proxy environment variables
139115
# Uses globals ``OFFLINE``, ``PIP_VIRTUAL_ENV``,
140116
# ``PIP_UPGRADE``, ``*_proxy``,

stack.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,9 +1421,6 @@ fi
14211421
# Check the status of running services
14221422
service_check
14231423

1424-
# Run pip check to make sure we're forward compatible with the pip depsolver.
1425-
pip_check
1426-
14271424
# Configure nova cellsv2
14281425
# ----------------------
14291426

0 commit comments

Comments
 (0)