aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-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_r45android-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_r48android-11.0.0_r47android-11.0.0_r46android-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 Li
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
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 917fd112a2 Change-Id: Ief1a2a709a2eb1eb2a682b2125ad25b371942715
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Idf9f782a0ccb7421478ac1182c36d16f78eda3a9
2019-10-21Upgrade python/ipaddress to v1.0.23 am: 6a1ca2ef83 am: ecd2315d45 am: ca97a0e49cHaibo Huang
am: de6dd07eb3 Change-Id: I98e6b26ce4e857d8899f9d7218d5c3aeb8fcd9eb
2019-10-21Upgrade python/ipaddress to v1.0.23 am: 6a1ca2ef83 am: ecd2315d45Haibo Huang
am: ca97a0e49c Change-Id: Ie12d0c6f669e791809aedc082d023b0c167c5092
2019-10-21Upgrade python/ipaddress to v1.0.23 am: 6a1ca2ef83Haibo Huang
am: ecd2315d45 Change-Id: I684d0d3be4b8b0560e17d37072add58fa8c978b9
2019-10-21Upgrade python/ipaddress to v1.0.23Haibo Huang
am: 6a1ca2ef83 Change-Id: I3146c483b3b75dcf8e82991b44ca063d8e2ffca9
2019-10-17Upgrade python/ipaddress to v1.0.23Haibo Huang
Test: None Change-Id: I9c2579d1a32759f6ed1e25bc63a663f18c235ed0
2019-10-18release 1.0.23upstream-masterPhilipp Hagemeister
2019-10-18README: Clarify that we are backporting 3.8+, not 3.3Philipp Hagemeister
2019-10-18README: wordingPhilipp Hagemeister
2019-10-18travis: add final newlinePhilipp Hagemeister
(This is a secret ploy to get travis to re-sync the master)
2019-10-18travis: Run flake8 only on Python 2.7Philipp Hagemeister
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.
2019-10-18Comprehensive docker testingPhilipp Hagemeister
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`.
2019-10-18Add a Dockerfile to run under Python2.7Philipp Hagemeister
Even Python2.7 is not easy to get hands on these days, so add a Dockerfile for that as well.
2019-10-18lintPhilipp Hagemeister
2019-10-18Merge commit af2006e from @chrahunt, to fix invalid escape sequencesPhilipp Hagemeister
2019-10-18lint: Make sure all lines are <= 80 chars longPhilipp Hagemeister
2019-10-18Fix building on travisPhilipp Hagemeister
Python 2.6 is only available on trusty, according to https://travis-ci.community/t/issue-with-python-2-6-on-linux/3861/4 .
2019-10-18Add a dockerfile to test building on Python2.6Philipp Hagemeister
These days, I don't have 2.6 installed on my machine anymore, so use a docker image to test that.
2019-10-18Add a test for #48Philipp Hagemeister
Also, make compat code compatible to 2.6 itself.
2019-10-18Merge pull request #48 from hroncok/patch-1Philipp Hagemeister
Add missing % in string formatting
2019-10-15Remove invalid escape sequencesChris Hunt
2019-07-24Add in TEST_MAPPING for acloud unittests. am: f3ba467d42 am: fd7daaacdf am: ↵Kevin Cheng
8cb13cbc3b am: 2458372292 am: 358dcaf470 Change-Id: I467f2ff8b1716d27bf1052b56b7ee634d4882f77
2019-07-23Add in TEST_MAPPING for acloud unittests. am: f3ba467d42 am: fd7daaacdf am: ↵Kevin Cheng
8cb13cbc3b am: 2458372292 Change-Id: I17a610c1e769116fc802e3d05119656727437706
2019-07-23Add in TEST_MAPPING for acloud unittests. am: f3ba467d42 am: fd7daaacdfKevin Cheng
am: 8cb13cbc3b Change-Id: I2b9e153615bf6a0622a3144dd7d1c539eb5e6b2a
2019-07-23Add in TEST_MAPPING for acloud unittests. am: f3ba467d42Kevin Cheng
am: fd7daaacdf Change-Id: Ief0f50e9d4d1e6fac67528d2ed3d329977e96f5c
2019-07-23Add in TEST_MAPPING for acloud unittests.ndk-sysroot-r21Kevin Cheng
am: f3ba467d42 Change-Id: I56ffc6d66219d96e3e538c86a70c887f9b6e2a4f
2019-07-23Add in TEST_MAPPING for acloud unittests.Kevin Cheng
Bug: 124250384 Test: atest Change-Id: I0f4f0560ba1fb5f8ac1d7937301aceda15106711
2019-05-08Merge commit 'd91da79' into import am: f8b29e13fb am: 9318fe5741Kevin Cheng
am: bcb01090b5 Change-Id: I7044923100a851e0ca3122b6adb02f593952a1dc
2019-05-08Merge commit 'd91da79' into import am: f8b29e13fbKevin Cheng
am: 9318fe5741 Change-Id: Iff7214364998cee6a935dceff6e692020b395785
2019-05-08Merge commit 'd91da79' into importplatform-tools-29.0.2platform-tools-29.0.1Kevin Cheng
am: f8b29e13fb Change-Id: I0b8ca39e8b071f089819d8221e541f6f115528fd
2019-05-08Merge commit 'd91da79' into importKevin Cheng
ipaddress v1.0.22 Add in METADATA/NOTICE/MODULE_LICENSE_PSF files Bug: 122778810 Test: None Change-Id: Iaffaefe18e4704a80e7cac614667670eb24c87cd
2019-05-06Initial empty repositoryInna Palant
2019-04-16Add missing % in string formattingMiro Hrončok
ipaddress.py:1106: SyntaxWarning: 'str' object is not callable; perhaps you missed a comma?
2018-09-16Merge pull request #45 from jdufresne/cap-pypiPhilipp Hagemeister
Correct capitalization of PyPI
2018-09-16Correct capitalization of PyPIJon Dufresne
As spelled on https://pypi.org/.
2018-06-10OTHER_BACKPORTS: Update textPhilipp Hagemeister
2018-06-10OTHER_BACKPORTS: Update last commitPhilipp Hagemeister
I checked, the two other have not been updated in the meantime.
2018-06-10Merge pull request #42 from jdufresne/pypiPhilipp Hagemeister
Update all pypi.python.org URLs to pypi.org
2018-06-09Update all pypi.python.org URLs to pypi.orgJon Dufresne
For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
2018-04-15Makefile: Also push to master (closes #40)Philipp Hagemeister
2018-04-15release 1.0.22Philipp Hagemeister
2018-04-15add a release scriptPhilipp Hagemeister
2018-04-14release 1.0.21Philipp Hagemeister
I forgot to update the version number in setup.py, so bump version to 1.0.21 to make sure that this correct and complete release is actually recorded in a commit.
2018-04-14release 1.0.20Philipp Hagemeister
2018-04-14Merge remote-tracking branch 'jdufresne/wheel'Philipp Hagemeister
2018-04-11Avoid using assertRaises as a context managerJon Dufresne
It is not compatible with Python 2.6 and causes test failures.
2018-04-10Distribute package as a universal wheelJon Dufresne
Wheels are the standard of Python distribution. Advantages of wheels includes: - Faster installation - Avoids arbitrary code execution during installation by avoiding setup.py - Allows better caching for testing and continuous integration - Creates .pyc files as part of installation to ensure they match the Python interpreter used - More consistent installs across platforms and machines When you'd normally run `python setup.py sdist upload`, run instead `python setup.py sdist bdist_wheel upload`. For additional information on wheels, see: https://pythonwheels.com/ Notice ipaddress is listed as one of the top sites without a wheel. For full details on wheel, see PEP-427: https://www.python.org/dev/peps/pep-0427/ The wheel includes the license file by using the [metadata] section in the setup.cfg file. For additional information on this feature, see: https://wheel.readthedocs.io/en/stable/index.html#including-the-license-in-the-generated-wheel-file
2017-12-16release 1.0.19Philipp Hagemeister
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 10:28:41 +0000