diff --git a/pysmi-1.5.0.tar.gz b/pysmi-1.5.0.tar.gz deleted file mode 100644 index a1b9441..0000000 --- a/pysmi-1.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e42bcd3961de71d58186f7a7fa6adac133701ae74cd19e6376289d89593b0af2 -size 124064 diff --git a/pysmi-1.5.4.tar.gz b/pysmi-1.5.4.tar.gz new file mode 100644 index 0000000..a7a3493 --- /dev/null +++ b/pysmi-1.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cffc1d018325d1810ad4554589ad113575dd2ae071409feb1fe1e1f0b56cd236 +size 122568 diff --git a/python-pysmi.changes b/python-pysmi.changes index c1cfc49..5453f05 100644 --- a/python-pysmi.changes +++ b/python-pysmi.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Oct 20 18:57:03 UTC 2024 - Dirk Müller + +- update to 1.5.4: + * Fixed a runtime error in pysnmp. + * Fixed a runtime error in pysnmp. + * Fixed a few runtime errors. + * Removed Python 3.8 support. + * Added Python 3.13 support. + * Renamed many items to meet PEP 8 requirements. + Compatibility layer is added, but will be removed in the + next release. + * Fixed a bug that Windows version and user name were not + correctly detected. +- drop support-new-pyasn1.patch (upstream) + ------------------------------------------------------------------- Wed Oct 9 06:31:17 UTC 2024 - Steve Kowalik diff --git a/python-pysmi.spec b/python-pysmi.spec index 7bb805e..ed7528c 100644 --- a/python-pysmi.spec +++ b/python-pysmi.spec @@ -31,14 +31,12 @@ %bcond_with test %endif Name: python-pysmi%{psuffix} -Version: 1.5.0 +Version: 1.5.4 Release: 0 Summary: SNMP SMI/MIB Parser License: BSD-2-Clause URL: https://github.com/lextudio/pysmi Source: https://files.pythonhosted.org/packages/source/p/pysmi/pysmi-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gh#lextudio/pysmi#5 -Patch0: support-new-pyasn1.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core} diff --git a/support-new-pyasn1.patch b/support-new-pyasn1.patch deleted file mode 100644 index 9656f14..0000000 --- a/support-new-pyasn1.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 01d0774948da432f39c5a89622d676e91b8c47af Mon Sep 17 00:00:00 2001 -From: Steve Kowalik -Date: Wed, 9 Oct 2024 17:20:45 +1100 -Subject: [PATCH] Remove use of str2octs from pyasn1 - -pyasn1 has been removing all Python 2 code from its codebase, and the -octets module has been removed from 0.6.1 onwards. Since we only support -Python 3.8, we can remove it and just encode to bytes. ---- - tests/test_objecttype_smiv2_pysnmp.py | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/tests/test_objecttype_smiv2_pysnmp.py b/tests/test_objecttype_smiv2_pysnmp.py -index fdec37e..b374332 100644 ---- a/tests/test_objecttype_smiv2_pysnmp.py -+++ b/tests/test_objecttype_smiv2_pysnmp.py -@@ -13,7 +13,6 @@ - except ImportError: - import unittest - --from pyasn1.compat.octets import str2octs - from pysmi.parser.smi import parserFactory - from pysmi.codegen.pysnmp import PySnmpCodeGen - from pysmi.codegen.symtable import SymtableCodeGen -@@ -75,7 +74,7 @@ def testObjectTypeStatus(self): - # TODO:revisit - # def testObjectTypeReference(self): - # self.assertEqual( -- # self.ctx['testObjectType'].getReference(), str2octs('ABC'), -+ # self.ctx['testObjectType'].getReference(), 'ABC'.encode('iso-8859-1'), - # 'bad REFERENCE' - # ) - -@@ -335,7 +334,7 @@ def setUp(self): - # TODO: pyasn1 does not like OctetString.defaultValue - def testObjectTypeSyntax(self): - self.assertEqual( -- self.ctx["testObjectType"].getSyntax(), str2octs("test value"), "bad DEFVAL" -+ self.ctx["testObjectType"].getSyntax(), "test value".encode('iso-8859-1'), "bad DEFVAL" - ) - - -@@ -374,7 +373,7 @@ def setUp(self): - def testObjectTypeSyntax(self): - self.assertEqual( - self.ctx["testObjectType"].getSyntax(), -- str2octs("\\ntest\nvalue\\"), -+ "\\ntest\nvalue\\".encode('iso-8859-1'), - "bad DEFVAL", - ) - -@@ -488,7 +487,7 @@ def setUp(self): - def testObjectTypeSyntax(self): - self.assertEqual( - self.ctx["testObjectType"].getSyntax().clone(""), -- str2octs(""), -+ "".encode('iso-8859-1'), - "bad size constrained SYNTAX", - ) - -@@ -526,7 +525,7 @@ def setUp(self): - def testObjectTypeSyntax(self): - self.assertEqual( - self.ctx["testObjectType"].getSyntax().clone(("set",)), -- str2octs("@"), -+ "@".encode('iso-8859-1'), - "bad BITS SYNTAX", - ) -