Update documentation for THIRD_PARTY_DEPS; add pymock.

This should fix our python presubmit tests.

Also make Artem and Patrik own the deps file.

Bug: webrtc:9264
Change-Id: I430c56e0b12c4feac7d7cbf766eea9e304cd9a20
Reviewed-on: https://webrtc-review.googlesource.com/76421
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23217}
This commit is contained in:
Patrik Höglund 2018-05-14 12:10:36 +02:00 committed by Commit Bot
parent b330688ef7
commit 3fe981adbf
6 changed files with 2426 additions and 0 deletions

2
OWNERS
View File

@ -14,6 +14,8 @@ per-file AUTHORS=*
per-file BUILD.gn=phoglund@webrtc.org per-file BUILD.gn=phoglund@webrtc.org
per-file DEPS=* per-file DEPS=*
per-file pylintrc=phoglund@webrtc.org per-file pylintrc=phoglund@webrtc.org
per-file THIRD_PARTY_DEPS=phoglund@webrtc.org
per-file THIRD_PARTY_DEPS=titovartem@webrtc.org
per-file WATCHLISTS=* per-file WATCHLISTS=*
per-file style-guide.md=danilchap@webrtc.org per-file style-guide.md=danilchap@webrtc.org
per-file style-guide.md=kwiberg@webrtc.org per-file style-guide.md=kwiberg@webrtc.org

View File

@ -1,3 +1,22 @@
# This file determines which parts of Chromium's third_party/ we copy.
# If a dependency is missing, add <dep> to the DEPS list in order to start
# copying third_party/<dep> from Chromium's third_party.
#
# Test your change like this:
# 1. Edit this file
# 2. Add
# "custom_vars": {
# "roll_chromium_into_webrtc": True,
# },
# to the WebRTC solution in your gclient.
# 3. gclient sync --deps=all
# 4. python tools_webrtc/autoroller/roll_deps.py --dry-run --ignore-unclean-workdir
# 5. git checkout -- . # Throw away rolls of existing deps.
# 6. You should now get untracked files in third_party/<dep>.
# 7. git add third_party/<dep>
# 8. git commit -am "Add third_party/<dep> to WebRTC"
# 9. git cl upload
DEPS = [ DEPS = [
# Common # Common
'binutils', 'binutils',
@ -15,6 +34,7 @@ DEPS = [
'openh264', 'openh264',
'opus', 'opus',
'protobuf', 'protobuf',
'pymock',
'requests', 'requests',
'rnnoise', 'rnnoise',
'usrsctp', 'usrsctp',

26
third_party/pymock/LICENSE.txt vendored Normal file
View File

@ -0,0 +1,26 @@
Copyright (c) 2003-2012, Michael Foord
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1
third_party/pymock/OWNERS vendored Normal file
View File

@ -0,0 +1 @@
sbc@chromium.org

10
third_party/pymock/README.chromium vendored Normal file
View File

@ -0,0 +1,10 @@
Name: mock
URL: http://pypi.python.org/pypi/mock
Version: 1.0.1
Security Critical: no
License: BSD
License File: NOT_SHIPPED
Description:
Python mock library, currently used by native_client_sdk. This is the
same mock library that is now part of python 3.3 where it is know as
unittest.mock.

2367
third_party/pymock/mock.py vendored Normal file

File diff suppressed because it is too large Load Diff