From 8d66090389ac531db85d25696b4a4d0857fafc56 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 31 Aug 2023 17:08:57 +0200 Subject: [PATCH] Update pyangbind version to 0.8.3.post1 Change-Id: Iae1ffeaacf39861e7ea05426d891035766daf07a Signed-off-by: garciadeblas --- pyangbind.patch | 46 ------------------------------------------- requirements-test.txt | 2 +- requirements.txt | 8 +++----- tox.ini | 2 -- 4 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 pyangbind.patch diff --git a/pyangbind.patch b/pyangbind.patch deleted file mode 100644 index 3077299..0000000 --- a/pyangbind.patch +++ /dev/null @@ -1,46 +0,0 @@ -####################################################################################### -# Copyright ETSI Contributors and Others. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. -####################################################################################### - -*** .tox/cover/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py 2023-05-10 06:50:57.876027148 -0400 ---- .tox/cover/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py 2023-05-10 06:51:11.772022417 -0400 -*************** limitations under the License. -*** 22,27 **** ---- 22,28 ---- - from __future__ import unicode_literals - - import collections -+ from six.moves import collections_abc - import copy - import uuid - from decimal import Decimal -*************** def TypedListType(*args, **kwargs): -*** 372,378 **** - if not isinstance(allowed_type, list): - allowed_type = [allowed_type] - -! class TypedList(collections.MutableSequence): - _pybind_generated_by = "TypedListType" - _list = list() - ---- 373,379 ---- - if not isinstance(allowed_type, list): - allowed_type = [allowed_type] - -! class TypedList(collections_abc.MutableSequence): - _pybind_generated_by = "TypedListType" - _list = list() - diff --git a/requirements-test.txt b/requirements-test.txt index 38c795e..4a1f035 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.2.7 +coverage==7.3.0 # via -r requirements-test.in nose2==0.13.0 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index dde5efa..da4aa3a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,11 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -bitarray==2.7.6 - # via pyangbind enum34==1.1.10 # via pyangbind -lxml==4.9.2 +lxml==4.9.3 # via # pyang # pyangbind @@ -26,11 +24,11 @@ pyang==2.5.3 # via # -r requirements.in # pyangbind -pyangbind==0.8.1 +pyangbind==0.8.3.post1 # via -r requirements.in pyyaml==6.0.1 # via -r requirements.in -regex==2023.6.3 +regex==2023.8.8 # via pyangbind six==1.16.0 # via pyangbind diff --git a/tox.ini b/tox.ini index d6ce5d5..1109b9c 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,6 @@ skip_install = false deps = {[testenv]deps} -r{toxinidir}/requirements-test.txt commands = - sh -c "patch {toxworkdir}/cover/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py < pyangbind.patch" sh -c 'make clean' sh -c 'make models Q=""' sh -c 'rm -f nosetests.xml' @@ -100,7 +99,6 @@ deps = {[testenv]deps} # In the commands, we copy the requirements.txt to be presented as a source file (.py) # so it gets included in the .deb package for others to consume commands = - sh -c "patch {toxworkdir}/dist/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py < pyangbind.patch" sh -c 'make clean' sh -c 'make Q=""' sh -c 'cp requirements.txt osm_im/requirements.txt' -- 2.25.1