Hello community, here is the log from the commit of package python-mock for openSUSE:Factory checked in at 2018-08-20 16:17:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mock (Old) and /work/SRC/openSUSE:Factory/.python-mock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-mock" Mon Aug 20 16:17:27 2018 rev:24 rq:628988 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-mock/python-mock.changes 2018-01-16 09:35:26.525146383 +0100 +++ /work/SRC/openSUSE:Factory/.python-mock.new/python-mock.changes 2018-08-20 16:17:29.796659806 +0200 @@ -1,0 +2,7 @@ +Mon Aug 13 13:06:03 UTC 2018 - mc...@suse.com + +- Remove dependency on unittest2 + Add remove_unittest2.patch to facilitate that + Remove unnecessary now unittest2-fallback.patch + +------------------------------------------------------------------- Old: ---- unittest2-fallback.patch New: ---- remove_unittest2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mock.spec ++++++ --- /var/tmp/diff_new_pack.8uzx1R/_old 2018-08-20 16:17:30.828661259 +0200 +++ /var/tmp/diff_new_pack.8uzx1R/_new 2018-08-20 16:17:30.832661264 +0200 @@ -16,33 +16,31 @@ # -%bcond_without python2 %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without python2 Name: python-mock Version: 2.0.0 Release: 0 -Url: http://www.voidspace.org.uk/python/mock/ Summary: A Python Mocking and Patching Library for Testing License: BSD-2-Clause Group: Development/Languages/Python -Source: https://pypi.io/packages/source/m/mock/mock-%{version}.tar.gz -Patch0: unittest2-fallback.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: http://www.voidspace.org.uk/python/mock/ +Source: https://files.pythonhosted.org/packages/source/m/mock/mock-%{version}.tar.gz +Patch0: remove_unittest2.patch BuildRequires: %{python_module pbr} BuildRequires: %{python_module setuptools >= 17.1} BuildRequires: %{python_module six} +BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-pbr +Requires: python-six >= 1.9 +BuildArch: noarch %if %{with python2} BuildRequires: python-funcsigs -BuildRequires: python-unittest2 %endif %ifpython2 Requires: python-funcsigs >= 1 %endif -Requires: python-pbr -Requires: python-six >= 1.9 -BuildArch: noarch - %python_subpackages %description @@ -63,13 +61,14 @@ %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check %python_exec setup.py test -%files %python_files -%defattr(-,root,root,-) -%doc README.rst LICENSE.txt +%files %{python_files} +%license LICENSE.txt +%doc README.rst %{python_sitelib}/* %changelog ++++++ remove_unittest2.patch ++++++ --- a/docs/conf.py +++ b/docs/conf.py @@ -33,7 +33,7 @@ import os import sys import mock from mock import * # yeah, I know :-/ -import unittest2 +import unittest import __main__ if os.getcwd() not in sys.path: --- a/mock/tests/support.py +++ b/mock/tests/support.py @@ -1,8 +1,6 @@ import sys info = sys.version_info -import unittest2 - try: callable = callable --- a/mock/tests/testcallable.py +++ b/mock/tests/testcallable.py @@ -2,7 +2,7 @@ # E-mail: fuzzyman AT voidspace DOT org DOT uk # http://www.voidspace.org.uk/python/mock/ -import unittest2 as unittest +import unittest from mock.tests.support import is_instance, X, SomeClass from mock import ( --- a/mock/tests/testhelpers.py +++ b/mock/tests/testhelpers.py @@ -3,7 +3,7 @@ # http://www.voidspace.org.uk/python/mock/ import six -import unittest2 as unittest +import unittest from mock import ( call, create_autospec, MagicMock, --- a/mock/tests/testmagicmethods.py +++ b/mock/tests/testmagicmethods.py @@ -16,7 +16,7 @@ import sys import textwrap import six -import unittest2 as unittest +import unittest from mock import Mock, MagicMock from mock.mock import _magics @@ -405,7 +405,7 @@ class TestMockingMagicMethods(unittest.T mock = MagicMock() def set_setattr(): mock.__setattr__ = lambda self, name: None - self.assertRaisesRegex(AttributeError, + six.assertRaisesRegex(self, AttributeError, "Attempting to set unsupported magic method '__setattr__'.", set_setattr ) --- a/mock/tests/testmock.py +++ b/mock/tests/testmock.py @@ -8,7 +8,7 @@ import sys import tempfile import six -import unittest2 as unittest +import unittest import mock from mock import ( @@ -207,7 +207,7 @@ class MockTest(unittest.TestCase): mock = create_autospec(f) mock.side_effect = ValueError('Bazinga!') - self.assertRaisesRegex(ValueError, 'Bazinga!', mock) + six.assertRaisesRegex(self, ValueError, 'Bazinga!', mock) @unittest.skipUnless('java' in sys.platform, 'This test only applies to Jython') @@ -503,7 +503,7 @@ class MockTest(unittest.TestCase): # this should be allowed mock.something - self.assertRaisesRegex( + six.assertRaisesRegex(self, AttributeError, "Mock object has no attribute 'something_else'", getattr, mock, 'something_else' @@ -522,12 +522,12 @@ class MockTest(unittest.TestCase): mock.x mock.y mock.__something__ - self.assertRaisesRegex( + six.assertRaisesRegex(self, AttributeError, "Mock object has no attribute 'z'", getattr, mock, 'z' ) - self.assertRaisesRegex( + six.assertRaisesRegex(self, AttributeError, "Mock object has no attribute '__foobar__'", getattr, mock, '__foobar__' @@ -593,13 +593,13 @@ class MockTest(unittest.TestCase): def test_assert_called_with_message(self): mock = Mock() - self.assertRaisesRegex(AssertionError, 'Not called', + six.assertRaisesRegex(self, AssertionError, 'Not called', mock.assert_called_with) def test_assert_called_once_with_message(self): mock = Mock(name='geoffrey') - self.assertRaisesRegex(AssertionError, + six.assertRaisesRegex(self, AssertionError, r"Expected 'geoffrey' to be called once\.", mock.assert_called_once_with) @@ -1488,7 +1488,7 @@ class MockTest(unittest.TestCase): second = mopen().readline() self.assertEqual('abc', first) self.assertEqual('abc', second) - + def test_mock_parents(self): for Klass in Mock, MagicMock: m = Klass() --- a/mock/tests/testpatch.py +++ b/mock/tests/testpatch.py @@ -6,7 +6,7 @@ import os import sys import six -import unittest2 as unittest +import unittest from mock.tests import support from mock.tests.support import SomeClass, is_instance, callable --- a/mock/tests/testsentinel.py +++ b/mock/tests/testsentinel.py @@ -2,7 +2,7 @@ # E-mail: fuzzyman AT voidspace DOT org DOT uk # http://www.voidspace.org.uk/python/mock/ -import unittest2 as unittest +import unittest from mock import sentinel, DEFAULT --- a/mock/tests/testwith.py +++ b/mock/tests/testwith.py @@ -4,7 +4,7 @@ from warnings import catch_warnings -import unittest2 as unittest +import unittest from mock.tests.support import is_instance from mock import MagicMock, Mock, patch, sentinel, mock_open, call --- a/setup.cfg +++ b/setup.cfg @@ -13,7 +13,6 @@ classifier = Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 2 - Programming Language :: Python :: 2.6 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.2 @@ -31,7 +30,7 @@ keyword = [extras] test = - unittest2>=1.1.0 + unittest docs = jinja2<2.7:python_version<"3.3" and python_version>="3" Pygments<2:python_version<"3.3" and python_version>="3" --- a/unittest.cfg +++ b/unittest.cfg @@ -1,18 +1,18 @@ [unittest] plugins = - unittest2.plugins.debugger - unittest2.plugins.checker - unittest2.plugins.doctestloader - unittest2.plugins.matchregexp - unittest2.plugins.moduleloading - unittest2.plugins.testcoverage - unittest2.plugins.growl - unittest2.plugins.filtertests - unittest2.plugins.junitxml - unittest2.plugins.timed - unittest2.plugins.counttests - unittest2.plugins.logchannels + unittest.plugins.debugger + unittest.plugins.checker + unittest.plugins.doctestloader + unittest.plugins.matchregexp + unittest.plugins.moduleloading + unittest.plugins.testcoverage + unittest.plugins.growl + unittest.plugins.filtertests + unittest.plugins.junitxml + unittest.plugins.timed + unittest.plugins.counttests + unittest.plugins.logchannels excluded-plugins =