From 2ded87b29908b284d0e36a9a89d4389958ce76b905f136a3afa777789c8c3ecf Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 10 Oct 2022 07:09:25 +0000 Subject: [PATCH] Accepting request 1007995 from home:mnhauke - Update to version 1.6.41 * Modify `uncfgtext`. Deprecate `add_uncfgtext()` * Add a dedicated bootstrap method (`_bootstrap_obj_init_junos()`) for parsing `syntax==junos` * Add `JunosCfgLine()` * Remove `NXOSConfigList()` and `ASAConfigList()` * Add test coverage for "parsing F5 configs as ios", "parsing F5 configs as junos" * Add config diff infrastructure (preparing to make heavy changes to diffs) * Fix problems with `ip_factory()` * Add `_ip` property to `IPv4Obj()` and `IPv6Obj()` * Add support for IPv4 Mapped IPv6 Addresses * Fix `BaseCfgLine().has_child_with()` method * Make `ip_factory()` more resilient * Code cleanup * Fix IPv6 bug in `ip_factory()` * Enhance `regex_groups` on `find_object_branches` * Add regex match group support to `find_object_branches` * Ensure masklen and prefix are int objects for `IPv4Obj()` and `IPv6Obj()` network mask length * Add `ccp_util.ip_factory()` * Added a "disable" and "enable" command to `ccp_logger_control()` * Add `ccp_logger_control()` * Fix race-condition for `CiscoConfParse` kwarg in `IOSConfigList`, `NXOSConfigList`, and `ASAConfigList` * Add explicit configuration file encoding with default encoding from python's locale module * Remove colorama dependency. - Drop patch: OBS-URL: https://build.opensuse.org/request/show/1007995 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ciscoconfparse?expand=0&rev=43 --- ciscoconfparse-1.6.0.tar.gz | 3 --- ciscoconfparse-1.6.41.tar.gz | 3 +++ no2to3.patch | 12 ------------ python-ciscoconfparse.changes | 37 +++++++++++++++++++++++++++++++++++ python-ciscoconfparse.spec | 18 ++++++++--------- 5 files changed, 49 insertions(+), 24 deletions(-) delete mode 100644 ciscoconfparse-1.6.0.tar.gz create mode 100644 ciscoconfparse-1.6.41.tar.gz delete mode 100644 no2to3.patch diff --git a/ciscoconfparse-1.6.0.tar.gz b/ciscoconfparse-1.6.0.tar.gz deleted file mode 100644 index 7fa4b00..0000000 --- a/ciscoconfparse-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e1f18718ff3c3888a612631d56da16c3d51e1147dbdde0a811c7c1b183d233d -size 151476 diff --git a/ciscoconfparse-1.6.41.tar.gz b/ciscoconfparse-1.6.41.tar.gz new file mode 100644 index 0000000..a1211ac --- /dev/null +++ b/ciscoconfparse-1.6.41.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10b5d5c8c34d9e7b1c8e0f20353b64dbb7746e64861e1242c6bfe15aabc967eb +size 132408 diff --git a/no2to3.patch b/no2to3.patch deleted file mode 100644 index dbc84b0..0000000 --- a/no2to3.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: ciscoconfparse-1.6.0/setup.py -=================================================================== ---- ciscoconfparse-1.6.0.orig/setup.py -+++ ciscoconfparse-1.6.0/setup.py -@@ -130,7 +130,6 @@ def setup_packages(): - long_description=read("README.rst"), - include_package_data=True, # See MANIFEST.in for explicit rules - packages=find_packages(), -- use_2to3=True, # Reqd for Windows + Py3 - ref Github issue #32 - zip_safe=False, - python_requires='>=3.5', - install_requires=REQUIRES, diff --git a/python-ciscoconfparse.changes b/python-ciscoconfparse.changes index ca30a46..61ad96c 100644 --- a/python-ciscoconfparse.changes +++ b/python-ciscoconfparse.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Tue Oct 4 19:58:09 UTC 2022 - Martin Hauke + +- Update to version 1.6.41 + * Modify `uncfgtext`. Deprecate `add_uncfgtext()` + * Add a dedicated bootstrap method (`_bootstrap_obj_init_junos()`) + for parsing `syntax==junos` + * Add `JunosCfgLine()` + * Remove `NXOSConfigList()` and `ASAConfigList()` + * Add test coverage for "parsing F5 configs as ios", "parsing F5 + configs as junos" + * Add config diff infrastructure (preparing to make heavy changes + to diffs) + * Fix problems with `ip_factory()` + * Add `_ip` property to `IPv4Obj()` and `IPv6Obj()` + * Add support for IPv4 Mapped IPv6 Addresses + * Fix `BaseCfgLine().has_child_with()` method + * Make `ip_factory()` more resilient + * Code cleanup + * Fix IPv6 bug in `ip_factory()` + * Enhance `regex_groups` on `find_object_branches` + * Add regex match group support to `find_object_branches` + * Ensure masklen and prefix are int objects for `IPv4Obj()` and + `IPv6Obj()` network mask length + * Add `ccp_util.ip_factory()` + * Added a "disable" and "enable" command to `ccp_logger_control()` + * Add `ccp_logger_control()` + * Fix race-condition for `CiscoConfParse` kwarg in + `IOSConfigList`, `NXOSConfigList`, and `ASAConfigList` + * Add explicit configuration file encoding with default encoding + from python's locale module + * Remove colorama dependency. +- Drop patch: + * no2to3.patch (not longer needed) +- Temporary disable tests since they are not longer part of the + pypi-tarball. + ------------------------------------------------------------------- Tue Mar 1 09:39:26 UTC 2022 - Dirk Müller diff --git a/python-ciscoconfparse.spec b/python-ciscoconfparse.spec index a4c48fc..0599761 100644 --- a/python-ciscoconfparse.spec +++ b/python-ciscoconfparse.spec @@ -19,26 +19,26 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-ciscoconfparse -Version: 1.6.0 +Version: 1.6.41 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 -Patch1: no2to3.patch -BuildRequires: %{python_module dnspython} -BuildRequires: %{python_module loguru} -BuildRequires: %{python_module passlib} +BuildRequires: %{python_module dnspython >= 2.1.0} +BuildRequires: %{python_module loguru >= 0.6.0} +BuildRequires: %{python_module passlib >= 1.7.4} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module toml >= 0.10.2} BuildRequires: fdupes BuildRequires: python-rpm-macros %if %{with python2} BuildRequires: python2-ipaddr >= 2.1.11 BuildRequires: python2-mock %endif -Requires: python-dnspython -Requires: python-loguru +Requires: python-dnspython >= 2.1.0 +Requires: python-loguru >= 0.6.0 %ifpython2 Requires: python-ipaddr >= 2.1.11 %endif @@ -70,11 +70,11 @@ relationships. %check # no online dns (and /etc/resolv.conf) available -%pytest -k "not (test_dns_lookup or test_reverse_dns_lookup)" +#%%pytest -k "not (test_dns_lookup or test_reverse_dns_lookup)" %files %{python_files} %license LICENSE -%doc CHANGES README.rst +%doc README.md %{python_sitelib}/ciscoconfparse %{python_sitelib}/ciscoconfparse-%{version}-py%{python_version}.egg-info