From e685e33a2294629d1c2ea397a612d3ca5443c1920e6a8356e4e253550a113251 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 23 Jan 2021 22:23:42 +0000 Subject: [PATCH] Accepting request 866260 from home:bnavigator:branches:devel:languages:python - Update to version 1.5.25 * Fix Github Issue gh#mpenning/ciscoconfparse#195 * merge PR gh#mpenning/ciscoconfparse#194 * fix multiple unreported bugs in ccp_util.L4Object() - Drop remove-mock.patch and test-lists.patch fixed upstream OBS-URL: https://build.opensuse.org/request/show/866260 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ciscoconfparse?expand=0&rev=37 --- ciscoconfparse-1.5.24.tar.gz | 3 --- ciscoconfparse-1.5.25.tar.gz | 3 +++ python-ciscoconfparse.changes | 9 +++++++++ python-ciscoconfparse.spec | 6 +----- remove-mock.patch | 16 ---------------- test-lists.patch | 29 ----------------------------- 6 files changed, 13 insertions(+), 53 deletions(-) delete mode 100644 ciscoconfparse-1.5.24.tar.gz create mode 100644 ciscoconfparse-1.5.25.tar.gz delete mode 100644 remove-mock.patch delete mode 100644 test-lists.patch diff --git a/ciscoconfparse-1.5.24.tar.gz b/ciscoconfparse-1.5.24.tar.gz deleted file mode 100644 index 94591c8..0000000 --- a/ciscoconfparse-1.5.24.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55ece212945a67c257bfa77e14f128c8d57e289695559caf809a35dd40c56176 -size 138368 diff --git a/ciscoconfparse-1.5.25.tar.gz b/ciscoconfparse-1.5.25.tar.gz new file mode 100644 index 0000000..02f7ebb --- /dev/null +++ b/ciscoconfparse-1.5.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57f06349e1d111b43bc4a0ccfd9714997bc231e8edde14682d81984c8a483c51 +size 138794 diff --git a/python-ciscoconfparse.changes b/python-ciscoconfparse.changes index 70972c8..2c744fa 100644 --- a/python-ciscoconfparse.changes +++ b/python-ciscoconfparse.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jan 23 18:32:44 UTC 2021 - Ben Greiner + +- Update to version 1.5.25 + * Fix Github Issue gh#mpenning/ciscoconfparse#195 + * merge PR gh#mpenning/ciscoconfparse#194 + * fix multiple unreported bugs in ccp_util.L4Object() +- Drop remove-mock.patch and test-lists.patch fixed upstream + ------------------------------------------------------------------- Fri Jan 22 15:01:09 UTC 2021 - Benjamin Greiner diff --git a/python-ciscoconfparse.spec b/python-ciscoconfparse.spec index 4cd1020..a2b4ba3 100644 --- a/python-ciscoconfparse.spec +++ b/python-ciscoconfparse.spec @@ -19,16 +19,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-ciscoconfparse -Version: 1.5.24 +Version: 1.5.25 Release: 0 Summary: Library for parsing, querying and modifying Cisco IOS-style configurations License: GPL-3.0-or-later URL: https://github.com/mpenning/ciscoconfparse Source: https://files.pythonhosted.org/packages/source/c/ciscoconfparse/ciscoconfparse-%{version}.tar.gz -# PATCH-FIX-UPSTREAM remove-mock.patch -- gh#mpenning/ciscoconfparse#194 -Patch0: remove-mock.patch -# PATCH-FIX-UPSTREAM test-lists.patch -- gh#mpenning/ciscoconfparse#195 -Patch1: test-lists.patch BuildRequires: %{python_module colorama} BuildRequires: %{python_module dnspython} BuildRequires: %{python_module passlib} diff --git a/remove-mock.patch b/remove-mock.patch deleted file mode 100644 index a53cdf6..0000000 --- a/remove-mock.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: ciscoconfparse-1.5.24/tests/test_CiscoConfParse.py -=================================================================== ---- ciscoconfparse-1.5.24.orig/tests/test_CiscoConfParse.py -+++ ciscoconfparse-1.5.24/tests/test_CiscoConfParse.py -@@ -1,7 +1,10 @@ - from operator import attrgetter - from itertools import repeat - from copy import deepcopy --from mock import patch -+try: -+ from unittest.mock import patch -+except ImportError: -+ from mock import patch - import platform - import sys - import re diff --git a/test-lists.patch b/test-lists.patch deleted file mode 100644 index 67df6b1..0000000 --- a/test-lists.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: ciscoconfparse-1.5.24/tests/test_Ccp_Util.py -=================================================================== ---- ciscoconfparse-1.5.24.orig/tests/test_Ccp_Util.py -+++ ciscoconfparse-1.5.24/tests/test_Ccp_Util.py -@@ -99,13 +99,13 @@ def testL4Object_asa_eq02(): - def testL4Object_asa_range01(): - pp = L4Object(protocol="tcp", port_spec="range smtp 32", syntax="asa") - assert pp.protocol == "tcp" -- assert pp.port_list == range(25, 33) -+ assert pp.port_list == list(range(25, 33)) - - - def testL4Object_asa_lt01(): - pp = L4Object(protocol="tcp", port_spec="lt echo", syntax="asa") - assert pp.protocol == "tcp" -- assert pp.port_list == range(1, 7) -+ assert pp.port_list == list(range(1, 7)) - - - @pytest.mark.xfail( -@@ -115,7 +115,7 @@ def testL4Object_asa_lt01(): - def testL4Object_asa_lt02(): - pp = L4Object(protocol="tcp", port_spec="lt 7", syntax="asa") - assert pp.protocol == "tcp" -- assert pp.port_list == range(1, 7) -+ assert pp.port_list == list(range(1, 7)) - - - def testIPv4Obj_contain():