Merge "python-builder: don't force siblings install"

docker/python-builder/scripts/install-from-bindep

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -e
+set -ex
 
 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get -y install $(cat /output/bindep/run.txt)
@@ -43,11 +43,8 @@ if [ -f /output/packages.txt ] ; then
   # image.
   pip install $CONSTRAINTS --cache-dir=/output/wheels -r /output/packages.txt $EXTRAS
 else
-  # Install the wheels.  Use --force here because sibling wheels might
-  # be built with the same version number as the latest release, but we
-  # really want the speculatively built wheels installed over any
-  # automatic dependencies.
-  pip install $CONSTRAINTS --force --cache-dir=/output/wheels /output/wheels/*.whl $EXTRAS
+  # Install the wheels.
+  pip install $CONSTRAINTS --cache-dir=/output/wheels /output/wheels/*.whl $EXTRAS
 fi
 
 # clean up after ourselves