From f35e3e5793f6481774aad1f50eed30d520eafb3a Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 15 Apr 2018 22:02:57 +0200 Subject: Makefile: Also push to master (closes #40) --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index e799f11..c3f52c4 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ release: git add ipaddress.py setup.py git commit -m "release ${VERSION}" git tag "v${VERSION}" + git push git push --tags $(MAKE) pypi -- cgit v1.2.3 From cebd3a9eb44ab9d54ed2140bb5be96308352c412 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sat, 9 Jun 2018 18:58:32 -0700 Subject: Update all pypi.python.org URLs to pypi.org For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html --- OTHER_BACKPORTS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OTHER_BACKPORTS.md b/OTHER_BACKPORTS.md index 67f57ac..32a19ef 100644 --- a/OTHER_BACKPORTS.md +++ b/OTHER_BACKPORTS.md @@ -1,16 +1,16 @@ There are three backports of ipaddress in the wild: -phihag/ipaddress ([ipaddress on PyPi](https://pypi.python.org/pypi/ipaddress)): +phihag/ipaddress ([ipaddress on PyPi](https://pypi.org/project/ipaddress/)): > First commit: 2013-02-03
> First release: 2013-02-04
> Latest commit: 2017-01-11 -kwi/py2-ipaddress ([py2-ipaddress on PyPi](https://pypi.python.org/pypi/py2-ipaddress)) +kwi/py2-ipaddress ([py2-ipaddress on PyPi](https://pypi.org/project/py2-ipaddress/)) > First commit: 2013-08-08
> First release: 2013-08-08
> Latest commit: 2015-07-14 -sk-/backport_ipaddress ([backport_ipaddress on PyPi](https://pypi.python.org/pypi/backport_ipaddress)) +sk-/backport_ipaddress ([backport_ipaddress on PyPi](https://pypi.org/project/backport_ipaddress/)) > First commit: 2014-08-15
> First release: 2014-09-01
> Latest commit: 2014-08-16 (!) -- cgit v1.2.3 From 3561913eee7b8457cf4a8115cfb4129f0bd528f6 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 10 Jun 2018 12:16:53 +0200 Subject: OTHER_BACKPORTS: Update last commit I checked, the two other have not been updated in the meantime. --- OTHER_BACKPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OTHER_BACKPORTS.md b/OTHER_BACKPORTS.md index 32a19ef..04c6371 100644 --- a/OTHER_BACKPORTS.md +++ b/OTHER_BACKPORTS.md @@ -3,7 +3,7 @@ There are three backports of ipaddress in the wild: phihag/ipaddress ([ipaddress on PyPi](https://pypi.org/project/ipaddress/)): > First commit: 2013-02-03
> First release: 2013-02-04
-> Latest commit: 2017-01-11 +> Latest commit: 2018-06-10 (as of June 2018) kwi/py2-ipaddress ([py2-ipaddress on PyPi](https://pypi.org/project/py2-ipaddress/)) > First commit: 2013-08-08
-- cgit v1.2.3 From 242b347ba0e155b45909ecbca73da53f67be4030 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 10 Jun 2018 12:17:46 +0200 Subject: OTHER_BACKPORTS: Update text --- OTHER_BACKPORTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OTHER_BACKPORTS.md b/OTHER_BACKPORTS.md index 04c6371..5e79111 100644 --- a/OTHER_BACKPORTS.md +++ b/OTHER_BACKPORTS.md @@ -19,7 +19,7 @@ In addition, judging by http://pypi-ranking.info/search/ipaddress/ , this backpo sk-/backport_ipaddress is a fork of kwi/py2-ipaddress. As you can see from the above dates, the project has basically never been updated after being released. So I'm just going to focus on my ipaddress vs py2-ipaddress. Mine has nearly 40x the download count. -As you can also see from the above stats, py2-ipaddress has not been updated for over a year. Sure, it's a backport and thus does not necessitate frequent updating, but for instance cPython has fixed a couple of bugs just recently, and they are certainly still present in py2-ipaddress. In contrast, I can and do regularly sync. Upstream cPython code is in the upstream branch and just gets merged, so you can sync if you need the bleeding-edge ipaddress code (but a pull request or issue would be fine too if that's what you need). +As you can also see from the above stats, py2-ipaddress has not been updated for over two years. Sure, it's a backport and thus does not necessitate frequent updating, but for instance cPython has fixed a couple of bugs just recently, and they are certainly still present in py2-ipaddress. In contrast, I can and do regularly sync. Upstream cPython code is in the upstream branch and just gets merged, so you can sync if you need the bleeding-edge ipaddress code (but a pull request or issue would be fine too if that's what you need). But I don't think it's even necessary to argument from metadata, when the technical facts speak for themselves: -- cgit v1.2.3 From 363af8821162f2429f316e505b931365fae0b9f6 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 16 Sep 2018 11:48:54 -0700 Subject: Correct capitalization of PyPI As spelled on https://pypi.org/. --- OTHER_BACKPORTS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OTHER_BACKPORTS.md b/OTHER_BACKPORTS.md index 5e79111..c9a8f9b 100644 --- a/OTHER_BACKPORTS.md +++ b/OTHER_BACKPORTS.md @@ -1,16 +1,16 @@ There are three backports of ipaddress in the wild: -phihag/ipaddress ([ipaddress on PyPi](https://pypi.org/project/ipaddress/)): +phihag/ipaddress ([ipaddress on PyPI](https://pypi.org/project/ipaddress/)): > First commit: 2013-02-03
> First release: 2013-02-04
> Latest commit: 2018-06-10 (as of June 2018) -kwi/py2-ipaddress ([py2-ipaddress on PyPi](https://pypi.org/project/py2-ipaddress/)) +kwi/py2-ipaddress ([py2-ipaddress on PyPI](https://pypi.org/project/py2-ipaddress/)) > First commit: 2013-08-08
> First release: 2013-08-08
> Latest commit: 2015-07-14 -sk-/backport_ipaddress ([backport_ipaddress on PyPi](https://pypi.org/project/backport_ipaddress/)) +sk-/backport_ipaddress ([backport_ipaddress on PyPI](https://pypi.org/project/backport_ipaddress/)) > First commit: 2014-08-15
> First release: 2014-09-01
> Latest commit: 2014-08-16 (!) -- cgit v1.2.3 From 7a44852e647cc05ca801311abd788f2d85d1f738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 16 Apr 2019 13:07:08 +0200 Subject: Add missing % in string formatting ipaddress.py:1106: SyntaxWarning: 'str' object is not callable; perhaps you missed a comma? --- ipaddress.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipaddress.py b/ipaddress.py index f2d0766..16f03bf 100644 --- a/ipaddress.py +++ b/ipaddress.py @@ -1103,7 +1103,7 @@ class _BaseNetwork(_IPAddressBase): try: # Always false if one is v4 and the other is v6. if a._version != b._version: - raise TypeError("%s and %s are not of the same version" (a, b)) + raise TypeError("%s and %s are not of the same version" % (a, b)) return (b.network_address <= a.network_address and b.broadcast_address >= a.broadcast_address) except AttributeError: -- cgit v1.2.3 From af2006e348c7c69b72e178f1134ecdc08db98b10 Mon Sep 17 00:00:00 2001 From: Chris Hunt Date: Tue, 15 Oct 2019 22:43:27 -0400 Subject: Remove invalid escape sequences --- test_ipaddress.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test_ipaddress.py b/test_ipaddress.py index 2cbe36a..18b103d 100644 --- a/test_ipaddress.py +++ b/test_ipaddress.py @@ -862,9 +862,9 @@ class IpaddrUnitTest(unittest.TestCase): self.ipv6_network = ipaddress.IPv6Network('2001:658:22a:cafe::/64') def testRepr(self): - self.assertTrue(re.match("IPv4Interface\(u?'1.2.3.4/32'\)", + self.assertTrue(re.match(r"IPv4Interface\(u?'1.2.3.4/32'\)", repr(ipaddress.IPv4Interface('1.2.3.4')))) - self.assertTrue(re.match("IPv6Interface\(u?'::1/128'\)", + self.assertTrue(re.match(r"IPv6Interface\(u?'::1/128'\)", repr(ipaddress.IPv6Interface('::1')))) # issue #16531: constructing IPv4Network from an (address, mask) tuple @@ -1014,7 +1014,8 @@ class IpaddrUnitTest(unittest.TestCase): [(ip1, ip3)]) self.assertEqual(128, ipaddress._count_righthand_zero_bits(0, 128)) self.assertTrue( - re.match("IPv4Network\(u?'1.2.3.0/24'\)", repr(self.ipv4_network))) + re.match(r"IPv4Network\(u?'1.2.3.0/24'\)", + repr(self.ipv4_network))) def testMissingAddressVersion(self): class Broken(ipaddress._BaseAddress): -- cgit v1.2.3 From 7bbbde9ca14a0399ef3b8faffbc07fb1d3f6e67c Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 02:37:37 +0200 Subject: Add a test for #48 Also, make compat code compatible to 2.6 itself. --- test_ipaddress.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test_ipaddress.py b/test_ipaddress.py index 2cbe36a..3705ca8 100644 --- a/test_ipaddress.py +++ b/test_ipaddress.py @@ -2161,7 +2161,7 @@ if not hasattr(BaseTestCase, 'assertRaisesRegex'): expected_regex = self.expected_regex if not expected_regex.search(str(exc_value)): - raise AssertionError('"{}" does not match "{}"'.format( + raise AssertionError('"{0}" does not match "{1}"'.format( expected_regex.pattern, str(exc_value))) return True @@ -2212,7 +2212,7 @@ class CompatTest(unittest.TestCase): self.assertEqual(ipaddress._compat_bit_length(4), 3) -class SingleIssuesTest(unittest.TestCase): +class SingleIssuesTest(BaseTestCase): # https://github.com/phihag/ipaddress/issues/14 def test_issue_14(self): self.assertTrue(ipaddress.ip_address('127.0.0.1').is_private) @@ -2225,6 +2225,11 @@ class SingleIssuesTest(unittest.TestCase): self.assertTrue(net2.subnet_of(net1)) self.assertFalse(net2.supernet_of(net1)) + def test_issue_48(self): + v6net = ipaddress.ip_network('::/0') + v4net = ipaddress.ip_network('1.2.3.0/24') + with self.assertRaisesRegex(TypeError, r'are not of the same version'): + v6net.subnet_of(v4net) if __name__ == '__main__': unittest.main() -- cgit v1.2.3 From 584ac7d2f2e916ecb5393923f4d31334ae98870d Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 02:37:59 +0200 Subject: Add a dockerfile to test building on Python2.6 These days, I don't have 2.6 installed on my machine anymore, so use a docker image to test that. --- .dockerignore | 3 +++ Dockerfile.python2.6 | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile.python2.6 diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..c778784 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +build +dist +ipaddress.egg-info diff --git a/Dockerfile.python2.6 b/Dockerfile.python2.6 new file mode 100644 index 0000000..1c11f9f --- /dev/null +++ b/Dockerfile.python2.6 @@ -0,0 +1,8 @@ +FROM lovato/python-2.6.6 +# Dockerfile to run tests under python2.6 + +# docker build -t ipaddress-python2.6 . -f Dockerfile.python2.6 + +ADD . . +RUN python test_ipaddress.py +CMD python test_ipaddress.py -- cgit v1.2.3 From 3240fdf99e3e62874e862987cd7f8cc1885e613a Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 02:39:52 +0200 Subject: Fix building on travis Python 2.6 is only available on trusty, according to https://travis-ci.community/t/issue-with-python-2-6-on-linux/3861/4 . --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ddc269c..9e2469a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: "trusty" language: python python: - "2.6" -- cgit v1.2.3 From 0a2411340c9ddf193477ee9b26aebf4c6d13f65b Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 02:44:42 +0200 Subject: lint: Make sure all lines are <= 80 chars long --- ipaddress.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ipaddress.py b/ipaddress.py index 16f03bf..8e09243 100644 --- a/ipaddress.py +++ b/ipaddress.py @@ -1103,7 +1103,8 @@ class _BaseNetwork(_IPAddressBase): try: # Always false if one is v4 and the other is v6. if a._version != b._version: - raise TypeError("%s and %s are not of the same version" % (a, b)) + raise TypeError( + "%s and %s are not of the same version" % (a, b)) return (b.network_address <= a.network_address and b.broadcast_address >= a.broadcast_address) except AttributeError: -- cgit v1.2.3 From 3721fa075a7b7bd7b9da893405073c51f0d4b458 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 02:50:14 +0200 Subject: lint --- test_ipaddress.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test_ipaddress.py b/test_ipaddress.py index 37d4990..a1721b8 100644 --- a/test_ipaddress.py +++ b/test_ipaddress.py @@ -2232,5 +2232,6 @@ class SingleIssuesTest(BaseTestCase): with self.assertRaisesRegex(TypeError, r'are not of the same version'): v6net.subnet_of(v4net) + if __name__ == '__main__': unittest.main() -- cgit v1.2.3 From 10a3a5e5f9807c039b6642fe4f64a951d8093cd4 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 02:50:25 +0200 Subject: Add a Dockerfile to run under Python2.7 Even Python2.7 is not easy to get hands on these days, so add a Dockerfile for that as well. --- Dockerfile.python2.7 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Dockerfile.python2.7 diff --git a/Dockerfile.python2.7 b/Dockerfile.python2.7 new file mode 100644 index 0000000..0e92635 --- /dev/null +++ b/Dockerfile.python2.7 @@ -0,0 +1,11 @@ +FROM python:2.7-alpine +# Dockerfile to run tests under python2.7 + +# docker build -t ipaddress-python2.7 . -f Dockerfile.python2.7 +RUN apk add make +RUN pip install flake8 + +ADD . . +RUN python test_ipaddress.py +RUN make lint +CMD python test_ipaddress.py -- cgit v1.2.3 From f92edc4e6163db3ea67b282acf79936f31b73009 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 03:02:43 +0200 Subject: Comprehensive docker testing 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`. --- Dockerfile.python2.6 | 8 -------- Dockerfile.python2.7 | 11 ----------- Makefile | 16 +++++++++++++++- test-python2.6.Dockerfile | 8 ++++++++ test-python2.7.Dockerfile | 11 +++++++++++ test-python3.2.Dockerfile | 8 ++++++++ test-python3.3.Dockerfile | 8 ++++++++ 7 files changed, 50 insertions(+), 20 deletions(-) delete mode 100644 Dockerfile.python2.6 delete mode 100644 Dockerfile.python2.7 create mode 100644 test-python2.6.Dockerfile create mode 100644 test-python2.7.Dockerfile create mode 100644 test-python3.2.Dockerfile create mode 100644 test-python3.3.Dockerfile diff --git a/Dockerfile.python2.6 b/Dockerfile.python2.6 deleted file mode 100644 index 1c11f9f..0000000 --- a/Dockerfile.python2.6 +++ /dev/null @@ -1,8 +0,0 @@ -FROM lovato/python-2.6.6 -# Dockerfile to run tests under python2.6 - -# docker build -t ipaddress-python2.6 . -f Dockerfile.python2.6 - -ADD . . -RUN python test_ipaddress.py -CMD python test_ipaddress.py diff --git a/Dockerfile.python2.7 b/Dockerfile.python2.7 deleted file mode 100644 index 0e92635..0000000 --- a/Dockerfile.python2.7 +++ /dev/null @@ -1,11 +0,0 @@ -FROM python:2.7-alpine -# Dockerfile to run tests under python2.7 - -# docker build -t ipaddress-python2.7 . -f Dockerfile.python2.7 -RUN apk add make -RUN pip install flake8 - -ADD . . -RUN python test_ipaddress.py -RUN make lint -CMD python test_ipaddress.py diff --git a/Makefile b/Makefile index c3f52c4..5ed5f51 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,22 @@ release: git push --tags $(MAKE) pypi +docker-test-all: docker-test-2.6 docker-test-2.7 docker-test-3.2 docker-test-3.3 + +docker-test-2.6: + docker build -t ipaddress-python2.6 . -f test-python2.6.Dockerfile + +docker-test-2.7: + docker build -t ipaddress-python2.7 . -f test-python2.7.Dockerfile + +docker-test-3.2: + docker build -t ipaddress-python3.2 . -f test-python3.2.Dockerfile + +docker-test-3.3: + docker build -t ipaddress-python3.3 . -f test-python3.3.Dockerfile + clean: rm -rf -- build dist ipaddress.egg-info -.PHONY: default test clean pypi lint +.PHONY: default test clean pypi lint docker-test-all docker-test-2.6 docker-test-2.7 docker-test-3.2 docker-test-3.3 diff --git a/test-python2.6.Dockerfile b/test-python2.6.Dockerfile new file mode 100644 index 0000000..5e16329 --- /dev/null +++ b/test-python2.6.Dockerfile @@ -0,0 +1,8 @@ +FROM lovato/python-2.6.6 +# Dockerfile to run tests under python2.6 + +# docker build -t ipaddress-python2.6 . -f test-python2.6.Dockerfile + +ADD . . +RUN python test_ipaddress.py +CMD python test_ipaddress.py diff --git a/test-python2.7.Dockerfile b/test-python2.7.Dockerfile new file mode 100644 index 0000000..9c58f6b --- /dev/null +++ b/test-python2.7.Dockerfile @@ -0,0 +1,11 @@ +FROM python:2.7-alpine +# Dockerfile to run tests under python2.7 + +# docker build -t ipaddress-python2.7 . -f test-python2.7.Dockerfile +RUN apk add make +RUN pip install flake8 + +ADD . . +RUN python test_ipaddress.py +RUN make lint +CMD python test_ipaddress.py diff --git a/test-python3.2.Dockerfile b/test-python3.2.Dockerfile new file mode 100644 index 0000000..56d2b46 --- /dev/null +++ b/test-python3.2.Dockerfile @@ -0,0 +1,8 @@ +FROM python:3.2-slim +# Dockerfile to run tests under python3.2 + +# docker build -t ipaddress-python3.2 . -f test-python3.2.Dockerfile + +ADD . . +RUN python test_ipaddress.py +CMD python test_ipaddress.py diff --git a/test-python3.3.Dockerfile b/test-python3.3.Dockerfile new file mode 100644 index 0000000..87c504e --- /dev/null +++ b/test-python3.3.Dockerfile @@ -0,0 +1,8 @@ +FROM python:3.3-alpine +# Dockerfile to run tests under python3.3 + +# docker build -t ipaddress-python3.3 . -f test-python3.3.Dockerfile + +ADD . . +RUN python test_ipaddress.py +CMD python test_ipaddress.py -- cgit v1.2.3 From 724c9d9d610c3f4d75729d93ac8a546cad5281ac Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 03:09:45 +0200 Subject: travis: Run flake8 only on Python 2.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. --- .travis.yml | 4 ++-- Makefile | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e2469a..c5f3090 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,10 @@ python: - "pypy" - "pypy3" install: - - "pip install flake8" + - "if python --version 2>&1 | grep -q ' 2\.7\.'; then pip install flake8 ; fi" script: - "make test" - - "make lint" + - "make lint-if-2.7" notifications: email: - phihag@phihag.de diff --git a/Makefile b/Makefile index 5ed5f51..604fd05 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,10 @@ test: python test_ipaddress.py lint: - @(python --version 2>&1 | grep -q ' 2\.6\.') || flake8 ipaddress.py test_ipaddress.py + flake8 *.py + +lint-if-2.7: + @if python --version 2>&1 | grep -q ' 2\.7\.'; then $(MAKE) lint ; fi pypi: python setup.py sdist bdist_wheel upload @@ -38,5 +41,5 @@ docker-test-3.3: clean: rm -rf -- build dist ipaddress.egg-info -.PHONY: default test clean pypi lint docker-test-all docker-test-2.6 docker-test-2.7 docker-test-3.2 docker-test-3.3 +.PHONY: default test clean pypi lint docker-test-all docker-test-2.6 docker-test-2.7 docker-test-3.2 docker-test-3.3 lint-if-2.7 -- cgit v1.2.3 From b0f2879e880671457f841d888c12f35d50ca7737 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 03:18:52 +0200 Subject: travis: add final newline (This is a secret ploy to get travis to re-sync the master) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5f3090..72393f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,4 +15,4 @@ script: notifications: email: - phihag@phihag.de -sudo: false \ No newline at end of file +sudo: false -- cgit v1.2.3 From 074225be9c73bc7e9f6f31ac9e43a83a49c78622 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 03:26:07 +0200 Subject: README: wording --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 77471c6..c1c6fad 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ipaddress Python 3.3+'s [ipaddress](http://docs.python.org/dev/library/ipaddress) for Python 2.6, 2.7, 3.2. -Note that as in Python 3.3+ you must use character strings and not byte strings for textual IP address representations: +Note that just like in Python 3.3+ you must use character strings and not byte strings for textual IP address representations: ```python >>> from __future__ import unicode_literals -- cgit v1.2.3 From f069b1572b25d71404bca3e6ae195f44c8f6e8e9 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 03:26:17 +0200 Subject: README: Clarify that we are backporting 3.8+, not 3.3 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c1c6fad..0a12bc0 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ ipaddress Python 3.3+'s [ipaddress](http://docs.python.org/dev/library/ipaddress) for Python 2.6, 2.7, 3.2. +This repository tracks the latest version from cpython, e.g. ipaddress from cpython 3.8 as of writing. + Note that just like in Python 3.3+ you must use character strings and not byte strings for textual IP address representations: ```python -- cgit v1.2.3 From d8aef06cc3ca8a6fd8570cda665b2bb879a29390 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 18 Oct 2019 03:30:15 +0200 Subject: release 1.0.23 --- ipaddress.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipaddress.py b/ipaddress.py index 8e09243..3e6f9e4 100644 --- a/ipaddress.py +++ b/ipaddress.py @@ -14,7 +14,7 @@ from __future__ import unicode_literals import itertools import struct -__version__ = '1.0.22' +__version__ = '1.0.23' # Compatibility functions _compat_int_types = (int,) diff --git a/setup.py b/setup.py index eba10de..7e99280 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ except ImportError: settings = { 'name': 'ipaddress', - 'version': '1.0.22', + 'version': '1.0.23', 'description': 'IPv4/IPv6 manipulation library', 'long_description': 'Port of the 3.3+ ipaddress module to 2.6, 2.7, 3.2', 'author': 'Philipp Hagemeister', -- cgit v1.2.3