This reverts commit 79b8e79488a6268f37244188ab831e99a99648c8.
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
... | ... |
@@ -111,30 +111,6 @@ function disable_python3_package { |
111 | 111 |
$xtrace |
112 | 112 |
} |
113 | 113 |
|
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 |
- |
|
138 | 114 |
# Wrapper for ``pip install`` to set cache and proxy environment variables |
139 | 115 |
# Uses globals ``OFFLINE``, ``PIP_VIRTUAL_ENV``, |
140 | 116 |
# ``PIP_UPGRADE``, ``*_proxy``, |
... | ... |
@@ -1421,9 +1421,6 @@ fi |
1421 | 1421 |
# Check the status of running services |
1422 | 1422 |
service_check |
1423 | 1423 |
|
1424 |
-# Run pip check to make sure we're forward compatible with the pip depsolver. |
|
1425 |
-pip_check |
|
1426 |
- |
|
1427 | 1424 |
# Configure nova cellsv2 |
1428 | 1425 |
# ---------------------- |
1429 | 1426 |
|