40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From b9571547316cf3d5b2f440d68f9f3fc99040dc0d Mon Sep 17 00:00:00 2001
|
|
From: Robert Scheck <robert@fedoraproject.org>
|
|
Date: Sat, 8 Oct 2022 20:53:47 +0200
|
|
Subject: [PATCH] Don't require Python nose and mock
|
|
|
|
---
|
|
setup.py | 2 +-
|
|
tests/test_regression.py | 6 +++++-
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index b880f27..c14a6a9 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -70,7 +70,7 @@
|
|
'Programming Language :: Python :: 3',
|
|
'Programming Language :: Python :: 3.6'
|
|
],
|
|
- setup_requires=["nose", "coverage", "mock"],
|
|
+ tests_require=["mock;python_version<'3.3'", "coverage"],
|
|
install_requires=["py-radix==0.10.0"] + (
|
|
["future", "ipaddress"] if sys.version_info.major == 2 else []
|
|
),
|
|
diff --git a/tests/test_regression.py b/tests/test_regression.py
|
|
index 8a71c7b..5f5e738 100644
|
|
--- a/tests/test_regression.py
|
|
+++ b/tests/test_regression.py
|
|
@@ -4,7 +4,11 @@
|
|
from aggregate6.aggregate6 import parse_args
|
|
from aggregate6.aggregate6 import main as agg_main
|
|
|
|
-from mock import patch
|
|
+try:
|
|
+ from unittest.mock import patch
|
|
+except ImportError:
|
|
+ from mock import patch
|
|
+
|
|
import io
|
|
import sys
|
|
import unittest
|