From c1da9b5834c9b452c75485fe8eaa24d86f0883b02a50f93cdc19c1a77ab2ee56 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 10 Dec 2024 08:07:42 +0000 Subject: [PATCH] make patch apply harder OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-napalm?expand=0&rev=35 --- python-napalm-no-mock.patch | 36 ++++++++++++++++++------------------ python-napalm.changes | 2 +- python-napalm.spec | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/python-napalm-no-mock.patch b/python-napalm-no-mock.patch index 4bb29ee..738b722 100644 --- a/python-napalm-no-mock.patch +++ b/python-napalm-no-mock.patch @@ -13,32 +13,32 @@ dependency. test/nxos_ssh/test_getters.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) -diff --git a/requirements-dev.txt b/requirements-dev.txt -index 0a766587e..af4394c46 100644 ---- a/requirements-dev.txt -+++ b/requirements-dev.txt +Index: napalm-5.0.0/requirements-dev.txt +=================================================================== +--- napalm-5.0.0.orig/requirements-dev.txt ++++ napalm-5.0.0/requirements-dev.txt @@ -7,7 +7,6 @@ pytest-cov==5.0.0 pytest-json-report==1.5.0 pyflakes==3.2.0 pylama==8.4.1 -mock==5.1.0 - mypy==1.10.0 + mypy==1.9.0 types-PyYAML==6.0.12.20240311 - types-requests==2.32.0.20240521 -diff --git a/test/eos/test_heredoc.py b/test/eos/test_heredoc.py -index cf5d891fa..418592771 100644 ---- a/test/eos/test_heredoc.py -+++ b/test/eos/test_heredoc.py + types-requests==2.31.0.20240406 +Index: napalm-5.0.0/test/eos/test_heredoc.py +=================================================================== +--- napalm-5.0.0.orig/test/eos/test_heredoc.py ++++ napalm-5.0.0/test/eos/test_heredoc.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import pytest from textwrap import dedent -diff --git a/test/nxos/test_getters.py b/test/nxos/test_getters.py -index 3baa5c4b2..3436051f9 100644 ---- a/test/nxos/test_getters.py -+++ b/test/nxos/test_getters.py +Index: napalm-5.0.0/test/nxos/test_getters.py +=================================================================== +--- napalm-5.0.0.orig/test/nxos/test_getters.py ++++ napalm-5.0.0/test/nxos/test_getters.py @@ -1,11 +1,12 @@ """Tests for getters.""" @@ -53,10 +53,10 @@ index 3baa5c4b2..3436051f9 100644 def mock_time(): -diff --git a/test/nxos_ssh/test_getters.py b/test/nxos_ssh/test_getters.py -index 3baa5c4b2..3436051f9 100644 ---- a/test/nxos_ssh/test_getters.py -+++ b/test/nxos_ssh/test_getters.py +Index: napalm-5.0.0/test/nxos_ssh/test_getters.py +=================================================================== +--- napalm-5.0.0.orig/test/nxos_ssh/test_getters.py ++++ napalm-5.0.0/test/nxos_ssh/test_getters.py @@ -1,11 +1,12 @@ """Tests for getters.""" diff --git a/python-napalm.changes b/python-napalm.changes index d4e44b4..fa33bca 100644 --- a/python-napalm.changes +++ b/python-napalm.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Dec 10 01:23:56 UTC 2024 - Steve Kowalik +Tue Dec 10 08:07:24 UTC 2024 - Steve Kowalik - Update to 5.0.0: * New features diff --git a/python-napalm.spec b/python-napalm.spec index c48ea37..096b0a5 100644 --- a/python-napalm.spec +++ b/python-napalm.spec @@ -23,7 +23,7 @@ Summary: Network Automation and Programmability Abstraction Layer License: Apache-2.0 URL: https://github.com/napalm-automation/napalm Source: https://github.com/napalm-automation/napalm/archive/%{version}.tar.gz#/napalm-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gh#napalm-automation/napalm#2155 +# PATCH-FIX-UPSTREAM Based on gh#napalm-automation/napalm#2155 Patch0: python-napalm-no-mock.patch # PATCH-FIX-UPSTREAM gh#napalm-automation/napalm#2137 Patch1: support-python-313.patch