Skip to content

Commit

Permalink
[vpython] Use catapult package versions.
Browse files Browse the repository at this point in the history
Use catapult package versions for OpenCV and NumPy. These versions are
explicitly asserted by the "catapult" test framework, and versions
outside of this range will not successfully load.

Note the catapult version dependency in the definition.

BUG=chromium:762005
TEST=None

Change-Id: I4659e0b6c28c8fd043a8f42c6993a11f2473cdeb
Reviewed-on: https://chromium-review.googlesource.com/721423
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509214}
  • Loading branch information
danjacques authored and Commit Bot committed Oct 17, 2017
1 parent 888951a commit 8bc5882
Showing 1 changed file with 21 additions and 2 deletions.
23 changes: 21 additions & 2 deletions .vpython
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,26 @@ python_version: "2.7"

# Used by:
# third_party/catapult
#
# This version must be compatible with the version range specified by
# //third_party/catapult/telemetry/telemetry/internal/util/external_modules.py
wheel: <
name: "infra/python/wheels/psutil/${platform}_${py_python}_${py_abi}"
version: "version:5.2.2"
>

# Used by:
# third_party/catapult
#
# This version must be compatible with the version range specified by
# //third_party/catapult/telemetry/telemetry/internal/util/external_modules.py
#
# This version must also be compatible with the "numpy" version, as "cv2"
# depends on "numpy". In this case, OpenCV@2.4.13.2 has been built against
# numpy@1.11.3.
wheel: <
name: "infra/python/wheels/opencv_python/${platform}_${py_python}_${py_abi}"
version: "version:3.2.0.7"
version: "version:2.4.13.2"
match_tag: <
platform: "win32"
>
Expand All @@ -51,7 +64,13 @@ wheel: <
platform: "macosx_10_6_intel"
>
>

# Used by:
# third_party/catapult
#
# This version must be compatible with the version range specified by
# //third_party/catapult/telemetry/telemetry/internal/util/external_modules.py
wheel: <
name: "infra/python/wheels/numpy/${platform}_${py_python}_${py_abi}"
version: "version:1.12.1"
version: "version:1.11.3"
>

0 comments on commit 8bc5882

Please sign in to comment.