forked from pool/python-bindep
Steve Kowalik
aa1a51c9f0
* Basic support for PopOS is now included.
* Python 2.7 and 3.5 are no longer supported.
* Bindep now depends on the distro python library to determine
details about the current platform. This library looks at both
/etc/os-release and lsb_release to find platform info. The
os-release file data is preferred and at times has slightly
different data than lsb_release. Every effort has been made
to make this transition backward compatible but some things
may have been missed. The motivation for this change is that
not all distros have lsb_release available and we can let the
distro library sort that out for us.
- Drop remove-mock.patch, merged upstream
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bindep?expand=0&rev=14
33 lines
999 B
Diff
33 lines
999 B
Diff
Index: bindep-2.11.0/bindep/tests/test_main.py
|
|
===================================================================
|
|
--- bindep-2.11.0.orig/bindep/tests/test_main.py
|
|
+++ bindep-2.11.0/bindep/tests/test_main.py
|
|
@@ -24,7 +24,10 @@ from fixtures import FakeLogger
|
|
from fixtures import Fixture
|
|
from fixtures import MonkeyPatch
|
|
from fixtures import TempDir
|
|
-import mock
|
|
+try:
|
|
+ from unittest import mock
|
|
+except ImportError:
|
|
+ import mock
|
|
from testtools import TestCase
|
|
|
|
from bindep.__main__ import main
|
|
Index: bindep-2.11.0/bindep/tests/test_depends.py
|
|
===================================================================
|
|
--- bindep-2.11.0.orig/bindep/tests/test_depends.py
|
|
+++ bindep-2.11.0/bindep/tests/test_depends.py
|
|
@@ -23,7 +23,10 @@ from textwrap import dedent
|
|
|
|
import distro
|
|
import fixtures
|
|
-import mock
|
|
+try:
|
|
+ from unittest import mock
|
|
+except ImportError:
|
|
+ import mock
|
|
import ometa.runtime
|
|
from testtools import ExpectedException
|
|
from testtools.matchers import Contains
|