pool/python-setuptools
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9b561131ed
python-setuptools/remove_mock.patch
Dirk Mueller 9b561131ed - update to 58.3.0: 
*  ``setup.py install`` and ``easy_install`` commands are now officially
    deprecated. Use other standards-based installers (like pip) and builders (like
    build). Workloads reliant on this behavior should pin to this major version of
    Setuptools.
  * #1988: Deprecated the ``bdist_rpm`` command.
  * #2785: Replace confirparser's readfp with read_file, deprecated since Python 3.2.
  * #2823: Officially deprecated support for ``setup_requires``. Users are
    encouraged instead to migrate to PEP 518 ``build-system.requires`` in
    ``pyproject.toml``. Users reliant on ``setup_requires`` should consider
    pinning to this major version to avoid disruption.
  * #2762: Changed codecov.yml to configure the threshold to be lower
  * #2757: Add windows arm64 launchers for scripts generated by easy_install.
  * #2800: Added ``--owner`` and ``--group`` options to the ``sdist`` command,
    for specifying file ownership within the produced tarball (similarly
    to the corresponding distutils ``sdist`` options).
  * #2792: Document how the legacy and non-legacy versions are compared, and
    reference to the `PEP 440 <https://www.python.org/dev/peps/pep-0440/>`_
    scheme.
  * #2773: Retain case in setup.cfg during sdist.
  * #2777: Build does not fail fast when ``use_2to3`` is supplied but set to a
     false value.
  * #2769: Build now fails fast when ``use_2to3`` is supplied.
  * #2765: In Distribution.finalize_options, suppress known removed entry points
    to avoid issues with older Setuptools.
  * #2086: Removed support for 2to3 during builds. Projects should port to a
    unified codebase or pin to an older version of Setuptools using PEP 518
    build-requires.
  * #2712: Added implicit globbing support for `[options.data_files]` values.
  * #2737: fix various syntax and style errors in code snippets in docs

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=220
2022-02-07 11:04:33 +00:00

169 lines
5.8 KiB
Diff
Raw Blame History

---
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(-)
Index: setuptools-58.3.0/pkg_resources/tests/test_markers.py
===================================================================
--- setuptools-58.3.0.orig/pkg_resources/tests/test_markers.py
+++ setuptools-58.3.0/pkg_resources/tests/test_markers.py
@@ -1,4 +1,4 @@
-import mock
+from . import mock
from pkg_resources import evaluate_marker
Index: setuptools-58.3.0/pkg_resources/tests/test_pkg_resources.py
===================================================================
--- setuptools-58.3.0.orig/pkg_resources/tests/test_pkg_resources.py
+++ setuptools-58.3.0/pkg_resources/tests/test_pkg_resources.py
@@ -9,10 +9,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,
Index: setuptools-58.3.0/setuptools/tests/__init__.py
===================================================================
--- setuptools-58.3.0.orig/setuptools/tests/__init__.py
+++ setuptools-58.3.0/setuptools/tests/__init__.py
@@ -5,6 +5,10 @@ import pytest
__all__ = ['fail_on_ascii']
+try:
+ import mock
+except ImportError:
+ from unittest import mock
is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
Index: setuptools-58.3.0/setuptools/tests/test_build_clib.py
===================================================================
--- setuptools-58.3.0.orig/setuptools/tests/test_build_clib.py
+++ setuptools-58.3.0/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
Index: setuptools-58.3.0/setuptools/tests/test_easy_install.py
===================================================================
--- setuptools-58.3.0.orig/setuptools/tests/test_easy_install.py
+++ setuptools-58.3.0/setuptools/tests/test_easy_install.py
@@ -12,7 +12,7 @@ import itertools
import distutils.errors
import io
import zipfile
-import mock
+from . import mock
import time
import re
import subprocess
Index: setuptools-58.3.0/setuptools/tests/test_msvc.py
===================================================================
--- setuptools-58.3.0.orig/setuptools/tests/test_msvc.py
+++ setuptools-58.3.0/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
Index: setuptools-58.3.0/setuptools/tests/test_packageindex.py
===================================================================
--- setuptools-58.3.0.orig/setuptools/tests/test_packageindex.py
+++ setuptools-58.3.0/setuptools/tests/test_packageindex.py
@@ -6,7 +6,7 @@ import urllib.request
import urllib.error
import http.client
-import mock
+from . import mock
import pytest
import setuptools.package_index
Index: setuptools-58.3.0/setuptools/tests/test_register.py
===================================================================
--- setuptools-58.3.0.orig/setuptools/tests/test_register.py
+++ setuptools-58.3.0/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
Index: setuptools-58.3.0/setuptools/tests/test_upload.py
===================================================================
--- setuptools-58.3.0.orig/setuptools/tests/test_upload.py
+++ setuptools-58.3.0/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
Index: setuptools-58.3.0/setuptools/tests/test_config.py
===================================================================
--- setuptools-58.3.0.orig/setuptools/tests/test_config.py
+++ setuptools-58.3.0/setuptools/tests/test_config.py
@@ -7,7 +7,7 @@ import configparser
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 distutils.core import Command
@@ -906,7 +906,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
Index: setuptools-58.3.0/pkg_resources/tests/__init__.py
===================================================================
--- /dev/null
+++ setuptools-58.3.0/pkg_resources/tests/__init__.py
@@ -0,0 +1,4 @@
+try:
+ import mock
+except ImportError:
+ from unittest import mock
Reference in New Issue View Git Blame Copy Permalink