From a8cbb9d5cff51a8734878b053d9a0391ccb74847 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 17 Jan 2017 09:02:57 -0500 Subject: [PATCH] New upstream release 0.7.19 (RHBZ#1413231) --- .gitignore | 1 + ...ts-in-issue-149-python-3-regression-.patch | 53 +++++++++++++++++++ python-netaddr.spec | 11 ++-- sources | 2 +- 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 0001-fixed-broken-tests-in-issue-149-python-3-regression-.patch diff --git a/.gitignore b/.gitignore index 4517d8e..848c6ca 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ netaddr-0.7.4.tar.gz /netaddr-0.7.15-tests.tar.gz /netaddr-0.7.17.tar.gz /netaddr-0.7.18.tar.gz +/netaddr-0.7.19.tar.gz diff --git a/0001-fixed-broken-tests-in-issue-149-python-3-regression-.patch b/0001-fixed-broken-tests-in-issue-149-python-3-regression-.patch new file mode 100644 index 0000000..0c03e02 --- /dev/null +++ b/0001-fixed-broken-tests-in-issue-149-python-3-regression-.patch @@ -0,0 +1,53 @@ +From 2ab73f10be7069c9412e853d2d0caf29bd624012 Mon Sep 17 00:00:00 2001 +From: David Moss +Date: Mon, 16 Jan 2017 22:17:16 +0000 +Subject: [PATCH] - fixed broken tests in issue #149 (python 3 regression in + 0.7.19) - only affects test suite + +--- + netaddr/tests/eui/test_ieee_parsers.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/netaddr/tests/eui/test_ieee_parsers.py b/netaddr/tests/eui/test_ieee_parsers.py +index 7877f09..81f1faa 100644 +--- a/netaddr/tests/eui/test_ieee_parsers.py ++++ b/netaddr/tests/eui/test_ieee_parsers.py +@@ -12,7 +12,7 @@ SAMPLE_DIR = os.path.dirname(__file__) + def test_oui_parser_py2(): + from cStringIO import StringIO + outfile = StringIO() +- with open(os.path.join(SAMPLE_DIR, 'sample_oui.txt')) as infile: ++ with open(os.path.join(SAMPLE_DIR, 'sample_oui.txt'), 'rb') as infile: + iab_parser = OUIIndexParser(infile) + iab_parser.attach(FileIndexer(outfile)) + iab_parser.parse() +@@ -23,7 +23,7 @@ def test_oui_parser_py2(): + def test_iab_parser_py2(): + from cStringIO import StringIO + outfile = StringIO() +- with open(os.path.join(SAMPLE_DIR, 'sample_iab.txt')) as infile: ++ with open(os.path.join(SAMPLE_DIR, 'sample_iab.txt'), 'rb') as infile: + iab_parser = IABIndexParser(infile) + iab_parser.attach(FileIndexer(outfile)) + iab_parser.parse() +@@ -34,7 +34,7 @@ def test_iab_parser_py2(): + def test_oui_parser_py3(): + from io import StringIO + outfile = StringIO() +- with open(os.path.join(SAMPLE_DIR, 'sample_oui.txt')) as infile: ++ with open(os.path.join(SAMPLE_DIR, 'sample_oui.txt'), 'rb') as infile: + iab_parser = OUIIndexParser(infile) + iab_parser.attach(FileIndexer(outfile)) + iab_parser.parse() +@@ -45,7 +45,7 @@ def test_oui_parser_py3(): + def test_iab_parser_py3(): + from io import StringIO + outfile = StringIO() +- with open(os.path.join(SAMPLE_DIR, 'sample_iab.txt')) as infile: ++ with open(os.path.join(SAMPLE_DIR, 'sample_iab.txt'), 'rb') as infile: + iab_parser = IABIndexParser(infile) + iab_parser.attach(FileIndexer(outfile)) + iab_parser.parse() +-- +2.9.3 + diff --git a/python-netaddr.spec b/python-netaddr.spec index 12da86a..ae29607 100644 --- a/python-netaddr.spec +++ b/python-netaddr.spec @@ -3,8 +3,8 @@ %endif Name: python-netaddr -Version: 0.7.18 -Release: 10%{?dist} +Version: 0.7.19 +Release: 1%{?dist} Summary: A pure Python network address representation and manipulation library License: BSD @@ -18,6 +18,8 @@ BuildRequires: python-sphinx BuildRequires: pytest Provides: python2-netaddr = %{version}-%{release} +Patch0: 0001-fixed-broken-tests-in-issue-149-python-3-regression-.patch + %global desc A network address manipulation library for Python\ \ Provides support for:\ @@ -57,10 +59,10 @@ BuildRequires: python3-pytest %prep %setup -q -n netaddr-%{version} +%patch0 -p1 # Make rpmlint happy, get rid of DOS line endings sed -i 's/\r//' netaddr/*.py netaddr/ip/*.py netaddr/eui/*.idx -rm runtests.py # Make rpmlint happy, rip out python shebang lines from most python # modules @@ -120,6 +122,9 @@ LANG=en_US.UTF-8 py.test-%{python3_version} %endif %changelog +* Tue Jan 17 2017 John Eckersberg - 0.7.19-1 +- New upstream release 0.7.19 (RHBZ#1413231) + * Mon Dec 19 2016 Miro Hrončok - 0.7.18-10 - Rebuild for Python 3.6 diff --git a/sources b/sources index 3dd9673..0fe6a17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c65bb34f8bedfbbca0b316c490cd13a0 netaddr-0.7.18.tar.gz +SHA512 (netaddr-0.7.19.tar.gz) = 8440dee19d51828cd0dee403ec8c2fbc70e42d8c7c922d1a6a2a752100f9a313c521fa5e0789e024af0998f713599d50cf986e96867d3cc62a4143875e52d6bf