Hello community,
here is the log from the commit of package python-setuptools for
openSUSE:Factory checked in at 2020-12-16 10:59:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-setuptools (Old)
and /work/SRC/openSUSE:Factory/.python-setuptools.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools"
Wed Dec 16 10:59:12 2020 rev:63 rq:855355 version:44.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-setuptools/python-setuptools.changes
2020-11-17 21:21:38.433118078 +0100
+++
/work/SRC/openSUSE:Factory/.python-setuptools.new.2328/python-setuptools.changes
2020-12-16 10:59:14.679496641 +0100
@@ -1,0 +2,6 @@
+Tue Dec 8 02:15:26 UTC 2020 - Matej Cepl <mc...@suse.com>
+
+- Add remove_mock.patch to remove dependency on the external mock
+ package.
+
+-------------------------------------------------------------------
New:
----
remove_mock.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.LgIKHK/_old 2020-12-16 10:59:15.847497789 +0100
+++ /var/tmp/diff_new_pack.LgIKHK/_new 2020-12-16 10:59:15.847497789 +0100
@@ -44,6 +44,9 @@
Source3: testdata.tar.gz
Patch0: sort-for-reproducibility.patch
Patch1: importlib.patch
+# PATCH-FIX-UPSTREAM remove_mock.patch bsc#[0-9]+ mc...@suse.com
+# we don't need stinking mock
+Patch2: remove_mock.patch
BuildRequires: %{python_module appdirs}
BuildRequires: %{python_module ordered-set}
BuildRequires: %{python_module packaging}
@@ -69,7 +72,6 @@
%if %{with test}
BuildRequires: %{python_module Paver}
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module mock}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest-fixture-config}
BuildRequires: %{python_module pytest-virtualenv}
@@ -99,9 +101,10 @@
%prep
%setup -q -n setuptools-%{version}
+
tar -xzvf %{SOURCE3}
-%patch0 -p1
-%patch1 -p1
+%autopatch -p1
+
find . -type f -name "*.orig" -delete
# fix rpmlint spurious-executable-perm
++++++ remove_mock.patch ++++++
---
pkg_resources/tests/test_markers.py | 2 +-
pkg_resources/tests/test_pkg_resources.py | 5 +----
setuptools/tests/__init__.py | 4 ++++
setuptools/tests/test_build_clib.py | 2 +-
setuptools/tests/test_easy_install.py | 2 +-
setuptools/tests/test_msvc.py | 2 +-
setuptools/tests/test_packageindex.py | 2 +-
setuptools/tests/test_register.py | 5 +----
setuptools/tests/test_test.py | 2 +-
setuptools/tests/test_upload.py | 5 +----
10 files changed, 13 insertions(+), 18 deletions(-)
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -1,4 +1,4 @@
-import mock
+from . import mock
from pkg_resources import evaluate_marker
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -12,10 +12,7 @@ import stat
import distutils.dist
import distutils.command.install_egg_info
-try:
- from unittest import mock
-except ImportError:
- import mock
+from . import mock
from pkg_resources import DistInfoDistribution, Distribution,
EggInfoDistribution
from setuptools.extern import six
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -4,6 +4,10 @@ import pytest
from setuptools.extern.six import PY2, PY3
+try:
+ import mock
+except ImportError:
+ from unittest import mock
__all__ = [
'fail_on_ascii', 'py2_only', 'py3_only'
--- a/setuptools/tests/test_build_clib.py
+++ b/setuptools/tests/test_build_clib.py
@@ -1,6 +1,6 @@
import pytest
-import mock
+from . import mock
from distutils.errors import DistutilsSetupError
from setuptools.command.build_clib import build_clib
from setuptools.dist import Distribution
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -14,7 +14,7 @@ import itertools
import distutils.errors
import io
import zipfile
-import mock
+from . import mock
import time
from setuptools.extern import six
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -5,7 +5,7 @@ Tests for msvc support module.
import os
import contextlib
import distutils.errors
-import mock
+from . import mock
import pytest
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -6,7 +6,7 @@ import distutils.errors
from setuptools.extern import six
from setuptools.extern.six.moves import urllib, http_client
-import mock
+from . import mock
import pytest
import pkg_resources
--- a/setuptools/tests/test_register.py
+++ b/setuptools/tests/test_register.py
@@ -2,10 +2,7 @@ from setuptools.command.register import
from setuptools.dist import Distribution
from setuptools.errors import RemovedCommandError
-try:
- from unittest import mock
-except ImportError:
- import mock
+from . import mock
import pytest
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
-import mock
+from . import mock
from distutils import log
import os
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -2,10 +2,7 @@ from setuptools.command.upload import up
from setuptools.dist import Distribution
from setuptools.errors import RemovedCommandError
-try:
- from unittest import mock
-except ImportError:
- import mock
+from . import mock
import pytest
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -5,7 +5,7 @@ import contextlib
import pytest
from distutils.errors import DistutilsOptionError, DistutilsFileError
-from mock import patch
+from setuptools.tests import mock
from setuptools.dist import Distribution, _Distribution
from setuptools.config import ConfigHandler, read_configuration
from setuptools.extern.six.moves import configparser
@@ -880,7 +880,7 @@ class TestExternalSetters:
})
return None
- @patch.object(_Distribution, '__init__', autospec=True)
+ @mock.patch.object(_Distribution, '__init__', autospec=True)
def test_external_setters(self, mock_parent_init, tmpdir):
mock_parent_init.side_effect = self._fake_distribution_init
--- /dev/null
+++ b/pkg_resources/tests/__init__.py
@@ -0,0 +1,4 @@
+try:
+ import mock
+except ImportError:
+ from unittest import mock
++++++ sort-for-reproducibility.patch ++++++
--- /var/tmp/diff_new_pack.LgIKHK/_old 2020-12-16 10:59:15.915497855 +0100
+++ /var/tmp/diff_new_pack.LgIKHK/_new 2020-12-16 10:59:15.915497855 +0100
@@ -1,8 +1,6 @@
-Index: setuptools-41.4.0/setuptools/command/easy_install.py
-===================================================================
---- setuptools-41.4.0.orig/setuptools/command/easy_install.py
-+++ setuptools-41.4.0/setuptools/command/easy_install.py
-@@ -417,7 +417,7 @@ class easy_install(Command):
+--- a/setuptools/command/easy_install.py
++++ b/setuptools/command/easy_install.py
+@@ -423,7 +423,7 @@ class easy_install(Command):
for spec in self.args:
self.easy_install(spec, not self.no_deps)
if self.record:
@@ -11,10 +9,8 @@
if self.root: # strip any package prefix
root_len = len(self.root)
for counter in range(len(outputs)):
-Index: setuptools-41.4.0/setuptools/command/egg_info.py
-===================================================================
---- setuptools-41.4.0.orig/setuptools/command/egg_info.py
-+++ setuptools-41.4.0/setuptools/command/egg_info.py
+--- a/setuptools/command/egg_info.py
++++ b/setuptools/command/egg_info.py
@@ -638,7 +638,7 @@ def warn_depends_obsolete(cmd, basename,
def _write_requirements(stream, reqs):
lines = yield_lines(reqs or ())
@@ -24,10 +20,8 @@
stream.writelines(lines)
-Index: setuptools-41.4.0/setuptools/dist.py
-===================================================================
---- setuptools-41.4.0.orig/setuptools/dist.py
-+++ setuptools-41.4.0/setuptools/dist.py
+--- a/setuptools/dist.py
++++ b/setuptools/dist.py
@@ -195,7 +195,7 @@ def write_pkg_file(self, file):
self.long_description_content_type
)
@@ -37,10 +31,8 @@
write_field('Provides-Extra', extra)
-Index: setuptools-41.4.0/setuptools/tests/test_egg_info.py
-===================================================================
---- setuptools-41.4.0.orig/setuptools/tests/test_egg_info.py
-+++ setuptools-41.4.0/setuptools/tests/test_egg_info.py
+--- a/setuptools/tests/test_egg_info.py
++++ b/setuptools/tests/test_egg_info.py
@@ -291,8 +291,8 @@ class TestEggInfo:
wheel>=0.5
pytest
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
