rpms/python-netaddr
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c8
Branches Tags
rpms:c8
rpms:c9-beta
rpms:c10s
rpms:c9s
rpms:c8s
rpms:c9
rpms:c8-beta
rpms:imports/c9-beta/python-netaddr-0.10.1-3.el9
rpms:imports/c10s/python-netaddr-1.3.0-2.el10
rpms:imports/c10s/python-netaddr-1.3.0-1.el10
rpms:imports/c10s/python-netaddr-0.10.1-6.el10
rpms:imports/c10s/python-netaddr-0.10.1-5.el10
rpms:imports/c9/python-netaddr-0.8.0-5.el9
rpms:imports/c9-beta/python-netaddr-0.8.0-5.el9
rpms:imports/c8-beta/python-netaddr-0.7.19-8.el8
rpms:imports/c8/python-netaddr-0.7.19-8.el8
...
pull from: rpms:c9-beta
Branches Tags
rpms:c9-beta
rpms:c10s
rpms:c9s
rpms:c8s
rpms:c9
rpms:c8-beta
rpms:c8
rpms:imports/c9-beta/python-netaddr-0.10.1-3.el9
rpms:imports/c10s/python-netaddr-1.3.0-2.el10
rpms:imports/c10s/python-netaddr-1.3.0-1.el10
rpms:imports/c10s/python-netaddr-0.10.1-6.el10
rpms:imports/c10s/python-netaddr-0.10.1-5.el10
rpms:imports/c9/python-netaddr-0.8.0-5.el9
rpms:imports/c9-beta/python-netaddr-0.8.0-5.el9
rpms:imports/c8-beta/python-netaddr-0.7.19-8.el8
rpms:imports/c8/python-netaddr-0.7.19-8.el8

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

6 changed files with 155 additions and 169 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/netaddr-0.7.19.tar.gz
SOURCES/netaddr-0.10.1.tar.gz

2
.python-netaddr.metadata
View File

@ -1 +1 @@
00e0ce7d7ebc1d6e7943e884aa51ccb7becdc9ea SOURCES/netaddr-0.7.19.tar.gz
bbfa2b78bb3c5b9558f8efb7bc3f1f57ac5fd644 SOURCES/netaddr-0.10.1.tar.gz

29
SOURCES/0001-Do-not-override-executable-path.patch
View File

@ -1,29 +0,0 @@
From 8b08c463a49bdcca455cdfbefa971c89bd309ddf Mon Sep 17 00:00:00 2001
From: John Eckersberg <jeckersb@redhat.com>
Date: Mon, 19 Feb 2018 15:20:54 -0500
Subject: [PATCH] Do not override executable path
Resolves: RHBZ#1546800
---
setup.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/setup.py b/setup.py
index 2bd2a08..4cd2780 100644
--- a/setup.py
+++ b/setup.py
@@ -177,11 +177,6 @@ def main():
scripts=['netaddr/tools/netaddr'],
url='https://github.com/drkjam/netaddr/',
version=netaddr.__version__,
- options={
- 'build_scripts': {
- 'executable': '/usr/bin/env python',
- },
- },
)
setup(**setup_options)
--
2.14.3

53
SOURCES/0001-fixed-broken-tests-in-issue-149-python-3-regression-.patch
View File

@ -1,53 +0,0 @@
From 2ab73f10be7069c9412e853d2d0caf29bd624012 Mon Sep 17 00:00:00 2001
From: David Moss <drkjam@gmail.com>
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

49
SOURCES/THANKS Normal file
View File

@ -0,0 +1,49 @@
netaddr is written and maintained by David P. D. Moss
It is released under the BSD License.
Many people further contributed to netaddr by reporting problems, suggesting
various improvements or submitting actual code. Here is a list of these people
(in alphabetical order). Help me keep it complete and free of errors.
Vincent Bernat <bernat AT debian.org>
Sebastien Douche <sdouche AT gmail.com>
John Eckersberg <john DOT eckersberg AT gmail.com>
Yi-Jheng Lin <yzlin AT cs.nctu.edu.tw>
Clay McClure <clay AT daemons.net>
Duncan McGreggor <duncan DOT mcgreggor AT gmail.com>
Stefan Nordhausen <stefan DOT nordhausen AT axiros.com>
Brian F. Peters <brianfpeters AT gmail.com>
James William Pye <jwp AT gmail.com>
Chaitan Rogers <chaitan DOT rogers AT gmail.com>
Victor Stinner <victor DOT stinner AT haypocalc.com>
Andrew Stromnov <stromnov AT gmail.com>
Thanks to everyone on the netaddr mailing list, those who raised bug reports
and to all those who have, directly and indirectly, guided and influenced the
development and distribution of this library.
Thanks also for the use of the following code contributions :-
a) Python Cookbook recipe 18.11: "Formatting Integers as Binary Strings"
Python Cookbook 2d ed. (O'Reilly Media 2005) ISBN 0596-00797-3
Alex Martelli, Anna Martelli Ravenscroft and David Ascher
b) ASPN Cookbook Recipe 466286: "Integer set type" by Heiko Wundram
http://code.activestate.com/recipes/466286/
And last but not least, thanks to Guido van Rossum for his encouraging words
and for giving us all Python.

189
SPECS/python-netaddr.spec
View File

@ -1,26 +1,21 @@
%if 0%{?fedora} || 0%{?rhel} > 7
%global with_python3 1
%endif
%if 0%{?rhel} > 7
%bcond_with python2
%else
%bcond_without python2
%endif
%bcond docs %{undefined rhel}
Name: python-netaddr
Version: 0.7.19
Release: 8%{?dist}
Version: 0.10.1
Release: 3%{?dist}
Summary: A pure Python network address representation and manipulation library
License: BSD
URL: http://github.com/drkjam/netaddr
Source0: https://pypi.python.org/packages/source/n/netaddr/netaddr-%{version}.tar.gz
# Remove once https://github.com/netaddr/netaddr/pull/345
Source1: THANKS
BuildArch: noarch
Patch0: 0001-fixed-broken-tests-in-issue-149-python-3-regression-.patch
Patch1: 0001-Do-not-override-executable-path.patch
%if %{with docs}
BuildRequires: python3-sphinx
BuildRequires: python3-furo
%endif
%global desc A network address manipulation library for Python\
\
@ -31,7 +26,8 @@ Layer 3 addresses\
* IPv4 and IPv6 addresses, subnets, masks, prefixes\
* iterating, slicing, sorting, summarizing and classifying IP networks\
* dealing with various ranges formats (CIDR, arbitrary ranges and globs, nmap)\
* set based operations (unions, intersections etc) over IP addresses and subnets\
* set based operations (unions, intersections etc) over IP addresses and\
subnets\
* parsing a large variety of different formats and notations\
* looking up IANA IP block information\
* generating DNS reverse lookups\
@ -49,113 +45,136 @@ Layer 2 addresses\
%description %_description
%if %{with python2}
%package -n python2-netaddr
Summary: %summary
%{?python_provide:%python_provide python2-netaddr}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-sphinx
BuildRequires: python2-pytest
%description -n python2-netaddr %_description
%endif #{with python2}
%if 0%{?with_python3}
%package -n python3-netaddr
Summary: A pure Python network address representation and manipulation library
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-sphinx
BuildRequires: python3-pytest
%description -n python3-netaddr
%{desc}
%endif
%prep
%setup -q -n netaddr-%{version}
%patch0 -p1
%patch1 -p1
# Make rpmlint happy, get rid of DOS line endings
sed -i 's/\r//' netaddr/*.py netaddr/ip/*.py netaddr/eui/*.idx
%autosetup -n netaddr-%{version} -p1
# Make rpmlint happy, rip out python shebang lines from most python
# modules
find netaddr -name "*.py" | \
xargs sed -i -e '1 {/^#!\//d}'
# Fix python executable
%if %{with python2}
sed -i -e '1s,/usr/bin/env python,%{__python2} %{?py_shbang_opts},' netaddr/tools/netaddr
%else
sed -i -e '1s,/usr/bin/env python,%{__python3} %{?py_shbang_opts},' netaddr/tools/netaddr
%endif #{with python2}
# Make rpmlint happy, fix permissions on documentation files
chmod 0644 README.md AUTHORS CHANGELOG COPYRIGHT LICENSE PKG-INFO
chmod 0644 README.rst AUTHORS CHANGELOG COPYRIGHT LICENSE PKG-INFO
%build
%if %{with python2}
%py2_build
%endif #{with python2}
%if 0%{?with_python3}
%py3_build
%endif
#docs
%if %{with docs}
pushd docs
%if %{with python2}
PYTHONPATH='../' sphinx-build -b html -d build/doctrees source html
%endif #{with python2}
%if 0%{?with_python3}
PYTHONPATH='../' sphinx-build-%{python3_version} -b html -d build/doctrees source python3/html
%endif
PYTHONPATH='../' sphinx-build-%{python3_version} -b html -d build/doctrees source html
rm -f python3/html/.buildinfo
popd
%endif
%install
%if 0%{?with_python3}
%py3_install
mv %{buildroot}%{_bindir}/netaddr %{buildroot}%{_bindir}/netaddr3
%endif
%if %{with python2}
%py2_install
%endif #{with python2}
%check
%if %{with python2}
py.test-%{python2_version}
%endif #{with python2}
%if 0%{?with_python3}
LANG=en_US.UTF-8 py.test-%{python3_version}
%endif
py.test-%{python3_version}
%if %{with python2}
%files -n python2-netaddr
%license COPYRIGHT LICENSE
%doc AUTHORS CHANGELOG
%doc README.md docs/html
%{python2_sitelib}/*
%{_bindir}/netaddr
%endif #{with python2}
%if 0%{?with_python3}
%files -n python3-netaddr
%license COPYRIGHT
%doc AUTHORS CHANGELOG
%doc README.md docs/python3/html
%{python3_sitelib}/*
%{_bindir}/netaddr3
%doc AUTHORS CHANGELOG README.rst
%if %{with docs}
%doc docs/python3/html
%endif
%{python3_sitelib}/*
%{_bindir}/netaddr
%changelog
* Mon Jul 09 2018 Petr Viktorin <pviktori@redhat.com> - 0.7.19-8
- Don't build python2 subpackage on rhel>7
https://bugzilla.redhat.com/show_bug.cgi?id=1567153
* Wed Nov 13 2024 Rafael Jeffman <rjeffman@redhat.com> - 0.10.1-3
- Bump version to rebuild due to brew issues
Resolves: RHEL-25506
* Tue Nov 12 2024 Rafael Jeffman <rjeffman@redhat.com> - 0.10.1-2
- Remove subpackage python3-netaddr-shell
Resolves: RHEL-25506
* Mon Nov 11 2024 Rafael Jeffman <rjeffman@redhat.com> - 0.10.1-1
- Rebase to version 0.10.1
Resolves: RHEL-25506
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.8.0-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.8.0-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 3 2020 John Eckersberg <jeckersb@redhat.com> - 0.8.0-1
- New upstream release 0.8.0 (rhbz#1853684)
* Fri Jun 19 2020 John Eckersberg <jeckersb@redhat.com> - 0.7.20-1
- New upstream release 0.7.20 (rhbz#1848782)
- Minor spec and rpmlint cleanups
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.7.19-22
- Rebuilt for Python 3.9
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.19-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Nov 7 2019 John Eckersberg <eck@redhat.com> - 0.7.19-20
- Remove python2 subpackage from Fedora 32+ (rhbz#1769871)
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.7.19-19
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.7.19-18
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.19-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jul 22 2019 John Eckersberg <eck@redhat.com> - 0.7.19-16
- Move /usr/bin/netaddr to python3 and remove python2 version
See https://fedoraproject.org/wiki/Changes/Python_means_Python3
* Mon Mar 11 2019 John Eckersberg <eck@redhat.com> - 0.7.19-15
- Remove BuildRequires on python2-sphinx
See https://fedoraproject.org/wiki/Changes/Sphinx2
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.19-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Nov 28 2018 John Eckersberg <eck@redhat.com> - 0.7.19-13
- Add python_provide for python3 subpackage per packaging guidelines (RHBZ#1654198)
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.7.19-12
- Drop explicit locale setting
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.19-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.7.19-10
- Rebuilt for Python 3.7
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.7.19-9
- Rebuilt for Python 3.7
* Thu Feb 22 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.7.19-8
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Mon Feb 19 2018 John Eckersberg <eck@redhat.com> - 0.7.19-7
- Fix shebang mangling for python3 (RHBZ#1546800)