python/python-napalm
SHA256
15
0
Fork 0
forked from pool/python-napalm
Code Pull Requests Activity

make patch apply harder

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-napalm?expand=0&rev=35
This commit is contained in:
Steve Kowalik
2024-12-10 08:07:42 +00:00
committed by Git OBS Bridge
parent 3fdf34b185
commit c1da9b5834
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
python-napalm-no-mock.patch
View File

@@ -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."""

2
python-napalm.changes
View File

@@ -1,5 +1,5 @@
-------------------------------------------------------------------
Tue Dec 10 01:23:56 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
Tue Dec 10 08:07:24 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 5.0.0:
* New features

2
python-napalm.spec
View File

@@ -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