Hello community,
here is the log from the commit of package python-ipaddress for
openSUSE:Factory checked in at 2020-03-08 22:21:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ipaddress (Old)
and /work/SRC/openSUSE:Factory/.python-ipaddress.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ipaddress"
Sun Mar 8 22:21:53 2020 rev:6 rq:780405 version:1.0.23
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ipaddress/python-ipaddress.changes
2018-04-22 14:31:11.791300663 +0200
+++
/work/SRC/openSUSE:Factory/.python-ipaddress.new.26092/python-ipaddress.changes
2020-03-08 22:21:56.331996067 +0100
@@ -1,0 +2,6 @@
+Fri Feb 28 22:46:33 UTC 2020 - Dirk Mueller <[email protected]>
+
+- update to 1.0.23
+ * bugfixes
+
+-------------------------------------------------------------------
Old:
----
ipaddress-1.0.22.tar.gz
New:
----
ipaddress-1.0.23.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ipaddress.spec ++++++
--- /var/tmp/diff_new_pack.wfPyHI/_old 2020-03-08 22:21:57.231996623 +0100
+++ /var/tmp/diff_new_pack.wfPyHI/_new 2020-03-08 22:21:57.243996630 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-ipaddress
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: python-ipaddress
-Version: 1.0.22
+Version: 1.0.23
Release: 0
Summary: Backport of the Python3 IPv4/IPv6 manipulation library to
older Python versions
License: Python-2.0
++++++ ipaddress-1.0.22.tar.gz -> ipaddress-1.0.23.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipaddress-1.0.22/Makefile
new/ipaddress-1.0.23/Makefile
--- old/ipaddress-1.0.22/Makefile 2018-04-15 20:00:24.000000000 +0200
+++ new/ipaddress-1.0.23/Makefile 2019-10-18 03:16:39.000000000 +0200
@@ -4,7 +4,10 @@
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
@@ -17,11 +20,26 @@
git add ipaddress.py setup.py
git commit -m "release ${VERSION}"
git tag "v${VERSION}"
+ git push
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 lint-if-2.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipaddress-1.0.22/PKG-INFO
new/ipaddress-1.0.23/PKG-INFO
--- old/ipaddress-1.0.22/PKG-INFO 2018-04-15 20:00:46.000000000 +0200
+++ new/ipaddress-1.0.23/PKG-INFO 2019-10-18 03:30:23.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: ipaddress
-Version: 1.0.22
+Version: 1.0.23
Summary: IPv4/IPv6 manipulation library
Home-page: https://github.com/phihag/ipaddress
Author: Philipp Hagemeister
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipaddress-1.0.22/README new/ipaddress-1.0.23/README
--- old/ipaddress-1.0.22/README 2017-12-16 17:40:23.000000000 +0100
+++ new/ipaddress-1.0.23/README 2019-10-18 03:26:14.000000000 +0200
@@ -3,7 +3,9 @@
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:
+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
>>> from __future__ import unicode_literals
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipaddress-1.0.22/README.md
new/ipaddress-1.0.23/README.md
--- old/ipaddress-1.0.22/README.md 2017-12-16 17:40:23.000000000 +0100
+++ new/ipaddress-1.0.23/README.md 2019-10-18 03:26:14.000000000 +0200
@@ -3,7 +3,9 @@
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:
+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
>>> from __future__ import unicode_literals
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipaddress-1.0.22/ipaddress.egg-info/PKG-INFO
new/ipaddress-1.0.23/ipaddress.egg-info/PKG-INFO
--- old/ipaddress-1.0.22/ipaddress.egg-info/PKG-INFO 2018-04-15
20:00:46.000000000 +0200
+++ new/ipaddress-1.0.23/ipaddress.egg-info/PKG-INFO 2019-10-18
03:30:23.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: ipaddress
-Version: 1.0.22
+Version: 1.0.23
Summary: IPv4/IPv6 manipulation library
Home-page: https://github.com/phihag/ipaddress
Author: Philipp Hagemeister
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipaddress-1.0.22/ipaddress.py
new/ipaddress-1.0.23/ipaddress.py
--- old/ipaddress-1.0.22/ipaddress.py 2018-04-15 20:00:41.000000000 +0200
+++ new/ipaddress-1.0.23/ipaddress.py 2019-10-18 03:30:15.000000000 +0200
@@ -14,7 +14,7 @@
import itertools
import struct
-__version__ = '1.0.22'
+__version__ = '1.0.23'
# Compatibility functions
_compat_int_types = (int,)
@@ -1103,7 +1103,8 @@
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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipaddress-1.0.22/setup.py
new/ipaddress-1.0.23/setup.py
--- old/ipaddress-1.0.22/setup.py 2018-04-15 20:00:41.000000000 +0200
+++ new/ipaddress-1.0.23/setup.py 2019-10-18 03:30:15.000000000 +0200
@@ -8,7 +8,7 @@
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',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipaddress-1.0.22/test_ipaddress.py
new/ipaddress-1.0.23/test_ipaddress.py
--- old/ipaddress-1.0.22/test_ipaddress.py 2018-04-14 19:45:00.000000000
+0200
+++ new/ipaddress-1.0.23/test_ipaddress.py 2019-10-18 02:50:05.000000000
+0200
@@ -862,9 +862,9 @@
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 @@
[(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):
@@ -2161,7 +2162,7 @@
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 +2213,7 @@
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 +2226,12 @@
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()
