From e8196d87191e3c1f537fbac17cf74537f53c437d4da4eb43004198cb2ba9f364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Mar 2020 09:17:39 +0000 Subject: [PATCH] Accepting request 786779 from home:pgajdos:python - version update to 1.0.1 * no upstream changelog - modified sources % test.py (downloaded newer version) - deleted sources - COPYING.LESSER (included in tarball) OBS-URL: https://build.opensuse.org/request/show/786779 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytricia?expand=0&rev=11 --- COPYING.LESSER | 165 ---------------------------------------- python-pytricia.changes | 10 +++ python-pytricia.spec | 15 ++-- pytricia-1.0.0.tar.gz | 3 - pytricia-1.0.1.tar.gz | 3 + test.py | 40 ++++++++++ 6 files changed, 59 insertions(+), 177 deletions(-) delete mode 100644 COPYING.LESSER delete mode 100644 pytricia-1.0.0.tar.gz create mode 100644 pytricia-1.0.1.tar.gz diff --git a/COPYING.LESSER b/COPYING.LESSER deleted file mode 100644 index f421eb4..0000000 --- a/COPYING.LESSER +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/python-pytricia.changes b/python-pytricia.changes index e5d909b..8ae2c84 100644 --- a/python-pytricia.changes +++ b/python-pytricia.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Mar 20 08:48:03 UTC 2020 - pgajdos@suse.com + +- version update to 1.0.1 + * no upstream changelog +- modified sources + % test.py (downloaded newer version) +- deleted sources + - COPYING.LESSER (included in tarball) + ------------------------------------------------------------------- Tue Jun 4 07:37:32 UTC 2019 - pgajdos@suse.com diff --git a/python-pytricia.spec b/python-pytricia.spec index 8683c2a..23798fc 100644 --- a/python-pytricia.spec +++ b/python-pytricia.spec @@ -1,7 +1,7 @@ # # spec file for package python-pytricia # -# Copyright (c) 2019 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 @@ -18,19 +18,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytricia -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: A library for IP address lookup in Python License: LGPL-3.0-or-later Group: Development/Languages/Python -Url: https://github.com/jsommers/pytricia +URL: https://github.com/jsommers/pytricia Source: https://files.pythonhosted.org/packages/source/p/pytricia/pytricia-%{version}.tar.gz # https://github.com/jsommers/pytricia/issues/25 -Source1: https://raw.githubusercontent.com/jsommers/pytricia/master/COPYING.LESSER -# shorthened https://raw.githubusercontent.com/jsommers/pytricia/master/test.py -# see https://github.com/jsommers/pytricia/issues/26 -Source2: test.py +Source2: https://raw.githubusercontent.com/jsommers/pytricia/master/test.py BuildRequires: %{python_module devel} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros %python_subpackages @@ -42,7 +40,6 @@ to recommend it over related modules (including py-radix and SubnetTree). %prep %setup -q -n pytricia-%{version} -cp %{SOURCE1} . cp %{SOURCE2} . %build @@ -53,7 +50,7 @@ export CFLAGS="%{optflags}" %python_install %check -%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m unittest discover +%pytest_arch test.py %files %{python_files} %license COPYING.LESSER diff --git a/pytricia-1.0.0.tar.gz b/pytricia-1.0.0.tar.gz deleted file mode 100644 index 139fda6..0000000 --- a/pytricia-1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8730de05a459a25c6c40b654e19e20907fab292845e6d993ba10f2fbaad90da -size 18915 diff --git a/pytricia-1.0.1.tar.gz b/pytricia-1.0.1.tar.gz new file mode 100644 index 0000000..a3b351a --- /dev/null +++ b/pytricia-1.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6d74d9bbed50352a7042608160ca771d238b2a862f340bcbb9e9ef8d1193d17 +size 20565 diff --git a/test.py b/test.py index 7b44194..ff42c57 100644 --- a/test.py +++ b/test.py @@ -411,4 +411,44 @@ class PyTriciaTests(unittest.TestCase): self.assertFalse('1.2.3.0/24' in pyt) + def testRaw(self): + pyt = pytricia.PyTricia(32, socket.AF_INET, True) + prefixes = [ + (b'\x01\x02\x00\x00', 16), + (b'\x01\x02\x02\x00', 24), + (b'\x01\x02\x03\x00', 24), + (b'\x01\x02\x03\x04', 32) + ] + values = ["A", "B", "C", "D"] + for prefix, value in zip(prefixes, values): + pyt.insert(prefix, value) + + with self.assertRaises(ValueError) as cm: + pyt.insert((b'invalid', 24), "Z") + self.assertEqual(pyt.get_key((b'\x01\x02\x02\x02', 30)), (b'\x01\x02\x02\x00', 24)) + self.assertListEqual(sorted(pyt.keys()), sorted(prefixes)) + self.assertEqual(pyt.parent((b'\x01\x02\x03\x04', 32)), (b'\x01\x02\x03\x00', 24)) + self.assertListEqual(list(pyt.children((b'\x01\x02\x03\x00', 24))), [(b'\x01\x02\x03\x04', 32)]) + self.assertListEqual(sorted(list(pyt)), sorted(prefixes)) + + def testRawIP6(self): + pyt = pytricia.PyTricia(128, socket.AF_INET6, True) + prefixes = [ + (b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x00\x00', 96+16), + (b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x02\x00', 96+24), + (b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x03\x00', 96+24), + (b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x03\x04', 96+32) + ] + values = ["A", "B", "C", "D"] + for prefix, value in zip(prefixes, values): + pyt.insert(prefix, value) + + self.assertEqual(pyt.get_key((b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x02\x02', 96+30)), (b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x02\x00', 96+24)) + self.assertListEqual(sorted(pyt.keys()), sorted(prefixes)) + self.assertEqual(pyt.parent((b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x03\x04', 96+32)), (b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x03\x00', 96+24)) + self.assertListEqual(list(pyt.children((b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x03\x00', 96+24))), [(b'\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\xAA\xBB\xCC\xDD\x01\x02\x03\x04', 96+32)]) + self.assertListEqual(sorted(list(pyt)), sorted(prefixes)) + +if __name__ == '__main__': + unittest.main()