summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-05Merge "Remove pymock now everyone's on python3." am: 973c30bb0bHEADandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1mastermainandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1845269 Change-Id: Iaeb2bccf226919d60708e5f081183e4564007429
2021-10-05Merge "Remove pymock now everyone's on python3."Treehugger Robot
2021-10-05Remove pymock now everyone's on python3.Elliott Hughes
This is built in now. Bug: http://b/151436598 Test: treehugger Change-Id: I79e73f3b65524a85e7d1181d0f07f5b60a0e67fc
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/python/mock am: f95dc360d1 am: ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseBob Badour
bb6267e067 am: cb02c5dffe Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1588557 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If22a3ab65b31d017772653b56a7973d01f0432ae
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to external/python/mock am: f95dc360d1 am: ↵Bob Badour
bb6267e067 Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1588557 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I23e3305b3144c093db24e7fc9690f871c617a579
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to external/python/mock am: f95dc360d1android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1588557 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I74a58e3d74b8e73369b1b305adfb7b131a6b4472
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/python/mockBob Badour
Added SPDX-license-identifier-BSD to: Android.bp mock/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1d1c4632b1f1bf4ffb0faa28f783961e09053013
2021-01-14Remove test mapping file for acloud_test am: 810d359137 am: 9d91fb7665 am: ↵Julien Desprez
085ccc3448 Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1550097 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I65902d1286c46e1476c63de5728deffccfe7dc5b
2021-01-14Remove test mapping file for acloud_test am: 810d359137 am: 9d91fb7665Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1550097 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I23a3aa08dbd98c90f7c513100b123f0a5cb2c3f6
2021-01-13Remove test mapping file for acloud_test am: 810d359137Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1550097 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ice95b7ac2b4a85cf162d6095c7e97a785cc33a0d
2021-01-13Remove test mapping file for acloud_testandroid-s-preview-1Julien Desprez
Not needed anymore. Exempt-From-Owner-Approval:clean up mapping files Test: presubmit Bug: 175408655 Change-Id: Ifc597a4b20d3c612ff7fa306dd16280aa5616435
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1a26ddc3d8 -s ours am: 18bf7909e0 am: 7970abcca2 am: bd81ec987b -s ours am skip reason: subject contains skip directive Change-Id: If94b070b8a7af472c648428394c5c909d6143713
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1a26ddc3d8 -s ours am: 18bf7909e0 am: 7970abcca2 Change-Id: Ia252e17bd7b65787bad3a7147d3d6908bc4a288e
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1a26ddc3d8 -s ours am: 18bf7909e0 Change-Id: I0cfa4ec83963598b9413ecbf929c86203c89e6fd
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1a26ddc3d8 -s ours am skip reason: subject contains skip directive Change-Id: Ib56607f6f12d1fbcb867e8834b115061fafb6d79
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: Iad2eb56a17bd06e465a6ff1ff22853b421f32872
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dcce41cd2c -s ours am: 908191f99c am: ab24e494f5 am: b83db54794 -s ours am skip reason: subject contains skip directive Change-Id: Ica5df866bf8f074e0f6f33ca1c9ee43ecc578294
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dcce41cd2c -s ours am: 908191f99c am: ab24e494f5 Change-Id: I15f702f9404d2274734a68e8cdf380979281e3f2
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dcce41cd2c -s ours am: 908191f99c Change-Id: I9a0e9975d5d3527ba6eaf18710f8cbc7a4b6dc8b
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dcce41cd2c -s ours am skip reason: subject contains skip directive Change-Id: I22dc64bf1f7af6dcc9834a711b22770c456ba1be
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: dcce41cd2c Change-Id: I443935812a57bb7bd2ca4edf2c2c8c8025a5c37b
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ie3a914841c5b532b5841e057b95a1aadc53d115f
2020-03-13Revert "Upgrade python/mock to 4.0.2" am: 3381fde741 am: 276f8d6022 am: ↵Automerger Merge Worker
4837d7c35e am: 9d5d8fdcb7 am: 4538b16524 Change-Id: Ifcfb18de8d3a058270f0f9b8517735ab0bf6d71e
2020-03-13Revert "Upgrade python/mock to 4.0.2" am: 3381fde741 am: 276f8d6022 am: ↵Automerger Merge Worker
4837d7c35e am: 9d5d8fdcb7 Change-Id: Ie53c72ea6d883c7b0e9b9ce1ccd804e24633de2e
2020-03-13Revert "Upgrade python/mock to 4.0.2" am: 3381fde741 am: 276f8d6022 am: ↵Automerger Merge Worker
4837d7c35e Change-Id: I6afcc41f0edbf9b26449fba5501ecfc59b35a037
2020-03-13Revert "Upgrade python/mock to 4.0.2" am: 3381fde741 am: 276f8d6022Automerger Merge Worker
Change-Id: I59adf0766aaeb79adb2b4326f08b998d1640953a
2020-03-13Revert "Upgrade python/mock to 4.0.2" am: 3381fde741 am: 276f8d6022Automerger Merge Worker
Change-Id: I7de1ceedb047681f0ff4bf9d58c7d06112d3c0f3
2020-03-13Revert "Upgrade python/mock to 4.0.2" am: 3381fde741Automerger Merge Worker
Change-Id: I3b6bdb23c93e4227a65d4592eb424a956a36e584
2020-03-13Revert "Upgrade python/mock to 4.0.2"android-r-preview-4android-r-preview-3android-r-preview-2Herbert Xue
This reverts commit 73ebb2ed5b2c2548259190bcbec2136f25598ec6. Reason for revert: The CL caused acloud unittest fail. (b/151394661) Bug: 151394661 Bug: 151400302 Change-Id: I174b84067f892cb343abdc3a3aebd90cd1ddb0d3
2020-03-12Upgrade python/mock to 4.0.2 am: 73ebb2ed5b am: f5ce53b581 am: f332c94a41 ↵Automerger Merge Worker
am: faca398e04 am: 56d7e669c2 Change-Id: Ie6a28a89e5fa806217aa39d2ceca470ae7703468
2020-03-12Upgrade python/mock to 4.0.2 am: 73ebb2ed5b am: f5ce53b581 am: f332c94a41 ↵Automerger Merge Worker
am: faca398e04 Change-Id: Ie05e2f987016c332b805e74642d591dc0f029f78
2020-03-12Upgrade python/mock to 4.0.2 am: 73ebb2ed5b am: f5ce53b581 am: f332c94a41Automerger Merge Worker
Change-Id: Iac1d39c758245a3ac9904f2e6d3c977e2290273c
2020-03-12Upgrade python/mock to 4.0.2 am: 73ebb2ed5b am: f5ce53b581Automerger Merge Worker
Change-Id: Ia3ddfac945fbf3d4b5ed13257d6cf81bfbf2a23a
2020-03-12Upgrade python/mock to 4.0.2 am: 73ebb2ed5b am: f5ce53b581Automerger Merge Worker
Change-Id: I5cbf2c2acaa5898ffa528f79290651b941661a6c
2020-03-12Upgrade python/mock to 4.0.2 am: 73ebb2ed5bAutomerger Merge Worker
Change-Id: Id330f80fd1b0a941929a3ab84dec1430ee30da5d
2020-03-12Upgrade python/mock to 4.0.2Haibo Huang
Test: None Exempt-From-Owner-Approval: Upgrade Change-Id: Ic0a71aca5940afe1cdbbc8bd7bef4034543fc1af
2020-03-11Add intersphinx.Chris Withers
2020-03-11Preparing for 4.0.2 release.Chris Withers
2020-03-11latest sync pointChris Withers
2020-03-11bpo-39915: Ensure await_args_list is updated according to the order in which ↵Karthikeyan Singaravelan
coroutines were awaited (GH-18924) Create call objects with awaited arguments instead of using call_args which has only last call value. Backports: e553f204bf0e39b1d701a364bc71b286acb9433f Signed-off-by: Chris Withers <chris@simplistix.co.uk>
2020-02-06Remove universal wheel tag and prepare for a 4.0.1 releaseChris Withers
2020-02-05Prepare for 4.0.0 releaseChris Withers
2020-01-29*sigh*Chris Withers
2020-01-29this skip is no longer neededChris Withers
2020-01-29*sigh*Chris Withers
2020-01-29another packaging test bugfixChris Withers
2020-01-29paranoid packaging check for 3.6Chris Withers
2020-01-29fixup: package checksChris Withers
2020-01-29Merge pull request #476 from cjw296/restart_for_4Chris Withers
version 4.0.0b1 - gulp...
2020-01-29Preparing for 4.1.0 release.Chris Withers
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 23:09:20 +0000