aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [LSC] Add LOCAL_LICENSE_KINDS to external/python/ipaddress am: d76ed6c2b9HEADandroid-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-4Bob Badour2021-02-191-0/+17
|\ | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/python/ipaddress/+/1588603 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic786090516e74af5b575623d111434e3cefc568f
| * [LSC] Add LOCAL_LICENSE_KINDS to external/python/ipaddressBob Badour2021-02-121-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SPDX-license-identifier-PSF-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5570c03a66c4452e400717f5633ff6d6f6ec3f53
* | Remove test mapping file for acloud_test am: 613100f4afJulien Desprez2021-01-131-8/+0
|\| | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/python/ipaddress/+/1549511 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I15797d18180b4d3e8f2e2f3cc9f25b991e4ced22
| * Remove test mapping file for acloud_testandroid-s-preview-1Julien Desprez2021-01-131-8/+0
|/ | | | | | | | Not needed anymore. Test: presubmit Bug: 175408655 Change-Id: Ia525926c2af822294eeec88dda02db9061c0189a
* [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
|\ | | | | | | | | | | stag-aosp-master am: 472a1c3569 -s ours am: 3d7b903c48 am: 678d488783 Change-Id: I074f54b47defc5c30a61e7fd20a49fb2c87864e6
| * [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\ | | | | | | | | | | | | | | | stag-aosp-master am: 472a1c3569 -s ours am: 3d7b903c48 Change-Id: Ibdb104eb6abd1375b0e037a5a78a5b85a42efbc2
| | * [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 472a1c3569 -s ours am skip reason: subject contains skip directive Change-Id: Ia8f52551230ee50e1b33160e3da6fd88d56a4745
| | | * DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li2020-04-090-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I9fcb37c0a716ec1d9eab75e2eddb8c13d89a47c2
| | | | * Remove redundant NOTICE symbolic link. am: 856d523490 am: 7e1a3f7dd4Bob Badour2020-03-251-1/+0
| | | | |\ | | | | |/ | | | |/| | | | | | Change-Id: I29863e35470d67e968c28d9955742c4bc070ba7e
* | | | | Remove redundant NOTICE symbolic link. am: 856d523490 am: 7e1a3f7dd4 am: ↵Bob Badour2020-03-261-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcc9cf6543 am: 13aeeea1d1 Change-Id: Ic54924e208a0ecd39070e1edbd108a36c398bf93
| * | | | Remove redundant NOTICE symbolic link. am: 856d523490 am: 7e1a3f7dd4 am: ↵Bob Badour2020-03-261-1/+0
|/| | | | | |/ / / | | | | | | | | | | | | | | | | bcc9cf6543 Change-Id: I976caf41078bfcf08ba01b34554a00feb3b894fe
| * / / Remove redundant NOTICE symbolic link. am: 856d523490 am: 7e1a3f7dd4Bob Badour2020-03-251-1/+0
|/| | | | |/ / | | | | | | Change-Id: I240bfd49123952c13625d4f450f5c18105123966
| * | Remove redundant NOTICE symbolic link. am: 856d523490Bob Badour2020-03-251-1/+0
| |\ \ | | |/ | |/| | | | Change-Id: Idbb4d6afef54d8a02dbfc17e979903f12fd85a70
| | * Remove redundant NOTICE symbolic link.Bob Badour2020-03-251-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I72121ddec68aeeb2f90517b77774560889c063f5
* | [automerger skipped] DO NOT MERGE - ↵android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li2019-10-300-0/+0
|\| | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 917fd112a2 am: ec5fa84d0c -s ours am skip reason: subject contains skip directive Change-Id: Ic804d9fc2327f7055cdb8fa5585ab1dcce0d98f9
| * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 917fd112a2 Change-Id: Ief1a2a709a2eb1eb2a682b2125ad25b371942715
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li2019-10-300-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: Idf9f782a0ccb7421478ac1182c36d16f78eda3a9
* | | | Upgrade python/ipaddress to v1.0.23 am: 6a1ca2ef83 am: ecd2315d45 am: ca97a0e49cHaibo Huang2019-10-2113-24/+93
|\| | | | | | | | | | | | | | | | | | | | | | | am: de6dd07eb3 Change-Id: I98e6b26ce4e857d8899f9d7218d5c3aeb8fcd9eb
| * | | Upgrade python/ipaddress to v1.0.23 am: 6a1ca2ef83 am: ecd2315d45Haibo Huang2019-10-2113-24/+93
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | am: ca97a0e49c Change-Id: Ie12d0c6f669e791809aedc082d023b0c167c5092
| | * | Upgrade python/ipaddress to v1.0.23 am: 6a1ca2ef83Haibo Huang2019-10-2113-24/+93
| | |\| | | | | | | | | | | | | | | | | | | | | am: ecd2315d45 Change-Id: I684d0d3be4b8b0560e17d37072add58fa8c978b9
| | | * Upgrade python/ipaddress to v1.0.23Haibo Huang2019-10-2113-24/+93
| | |/| | | | | | | | | | | | | | | | | | | | | am: 6a1ca2ef83 Change-Id: I3146c483b3b75dcf8e82991b44ca063d8e2ffca9
| | | * Upgrade python/ipaddress to v1.0.23Haibo Huang2019-10-1713-24/+93
| | | |\ | | | | | | | | | | | | | | | | | | | | Test: None Change-Id: I9c2579d1a32759f6ed1e25bc63a663f18c235ed0
| | | | * release 1.0.23upstream-masterPhilipp Hagemeister2019-10-182-2/+2
| | | | |
| | | | * README: Clarify that we are backporting 3.8+, not 3.3Philipp Hagemeister2019-10-181-0/+2
| | | | |
| | | | * README: wordingPhilipp Hagemeister2019-10-181-1/+1
| | | | |
| | | | * travis: add final newlinePhilipp Hagemeister2019-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | (This is a secret ploy to get travis to re-sync the master)
| | | | * travis: Run flake8 only on Python 2.7Philipp Hagemeister2019-10-182-4/+7
| | | | | | | | | | | | | | | | | | | | flake8 has major problems on 2.6, 3.2, and 3.3: See https://travis-ci.org/phihag/ipaddress/jobs/599423233 and https://travis-ci.org/phihag/ipaddress/jobs/599423234 for examples.
| | | | * Comprehensive docker testingPhilipp Hagemeister2019-10-185-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | Docker in conjuction with make allows us to test all 4 supported Python versions in parallel. Add Dockerfiles for 2.6 and 2.7, and rename the existing dockerfiles to end in `.Dockerfile`.
| | | | * Add a Dockerfile to run under Python2.7Philipp Hagemeister2019-10-181-0/+11
| | | | | | | | | | | | | | | | | | | | Even Python2.7 is not easy to get hands on these days, so add a Dockerfile for that as well.
| | | | * lintPhilipp Hagemeister2019-10-181-0/+1
| | | | |
| | | | * Merge commit af2006e from @chrahunt, to fix invalid escape sequencesPhilipp Hagemeister2019-10-181-3/+4
| | | | |\
| | | | | * Remove invalid escape sequencesChris Hunt2019-10-151-3/+4
| | | | | |
| | | | * | lint: Make sure all lines are <= 80 chars longPhilipp Hagemeister2019-10-181-1/+2
| | | | | |
| | | | * | Fix building on travisPhilipp Hagemeister2019-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Python 2.6 is only available on trusty, according to https://travis-ci.community/t/issue-with-python-2-6-on-linux/3861/4 .
| | | | * | Add a dockerfile to test building on Python2.6Philipp Hagemeister2019-10-182-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | These days, I don't have 2.6 installed on my machine anymore, so use a docker image to test that.
| | | | * | Add a test for #48Philipp Hagemeister2019-10-181-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Also, make compat code compatible to 2.6 itself.
| | | | * | Merge pull request #48 from hroncok/patch-1Philipp Hagemeister2019-10-181-1/+1
| | | | |\ \ | | | | | |/ | | | | |/| Add missing % in string formatting
| | | | | * Add missing % in string formattingMiro Hrončok2019-04-161-1/+1
| | | | |/ | | | | | | | | | | ipaddress.py:1106: SyntaxWarning: 'str' object is not callable; perhaps you missed a comma?
| | | | * Merge pull request #45 from jdufresne/cap-pypiPhilipp Hagemeister2018-09-161-3/+3
| | | | |\ | | | | | | | | | | | | Correct capitalization of PyPI
| | | | | * Correct capitalization of PyPIJon Dufresne2018-09-161-3/+3
| | | | |/ | | | | | | | | | | | | | | | As spelled on https://pypi.org/.
| | | | * OTHER_BACKPORTS: Update textPhilipp Hagemeister2018-06-101-1/+1
| | | | |
| | | | * OTHER_BACKPORTS: Update last commitPhilipp Hagemeister2018-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | I checked, the two other have not been updated in the meantime.
| | | | * Merge pull request #42 from jdufresne/pypiPhilipp Hagemeister2018-06-101-3/+3
| | | | |\ | | | | | | | | | | | | Update all pypi.python.org URLs to pypi.org
| | | | | * Update all pypi.python.org URLs to pypi.orgJon Dufresne2018-06-091-3/+3
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
| | | | * Makefile: Also push to master (closes #40)Philipp Hagemeister2018-04-151-0/+1
| | | | |
* | | | | Add in TEST_MAPPING for acloud unittests. am: f3ba467d42 am: fd7daaacdf am: ↵Kevin Cheng2019-07-241-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cb13cbc3b am: 2458372292 am: 358dcaf470 Change-Id: I467f2ff8b1716d27bf1052b56b7ee634d4882f77
| * | | | Add in TEST_MAPPING for acloud unittests. am: f3ba467d42 am: fd7daaacdf am: ↵Kevin Cheng2019-07-231-0/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cb13cbc3b am: 2458372292 Change-Id: I17a610c1e769116fc802e3d05119656727437706
| | * | | Add in TEST_MAPPING for acloud unittests. am: f3ba467d42 am: fd7daaacdfKevin Cheng2019-07-231-0/+8
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8cb13cbc3b Change-Id: I2b9e153615bf6a0622a3144dd7d1c539eb5e6b2a
| | * | | Add in TEST_MAPPING for acloud unittests. am: f3ba467d42Kevin Cheng2019-07-231-0/+8
| |/| | | | | |/ / | | | | | | | | | | | | | | | | am: fd7daaacdf Change-Id: Ief0f50e9d4d1e6fac67528d2ed3d329977e96f5c
| | * | Add in TEST_MAPPING for acloud unittests.ndk-sysroot-r21Kevin Cheng2019-07-231-0/+8
| |/| | | | | | | | | | | | | | | | | | | | | | am: f3ba467d42 Change-Id: I56ffc6d66219d96e3e538c86a70c887f9b6e2a4f