Daniel Garcia
c0badd16dd
python3.8 bsc#1204395 - Update to version 65.5.0: * #3624: Fixed editable install for multi-module/no-package src-layout projects. * #3626: Minor refactorings to support distutils using stdlib logging module. * #3419: Updated the example version numbers to be compliant with PEP-440 on the "Specifying Your Project’s Version" page of the user guide. * #3569: Improved information about conflicting entries in the current working directory and editable install (in documentation and as an informational warning). * #3576: Updated version of validate_pyproject. - v65.4.1 * #3613: Fixed encoding errors in expand.StaticModule when system default encoding doesn't match expectations for source files. * #3617: Merge with pypa/distutils@6852b20 including fix for pypa/distutils#181. - v65.4.0 * #3609: Merge with pypa/distutils@d82d926 including support for DIST_EXTRA_CONFIG in pypa/distutils#177. - v65.3.0 * #3547: Stop ConfigDiscovery.analyse_name from splatting the Distribution.name attribute -- by :user:`jeamland` * #3554: Changed requires to requests in the pyproject.toml example in the :doc:`Dependency management section of the Quickstart guide <userguide/quickstart>` -- by :user:`mfbutner` * #3561: Fixed accidental name matching in editable hooks. - v65.2.0 * #3553: Sync with pypa/distutils@22b9bcf, including fixed cross-compiling support and removing deprecation warning per pypa/distutils#169. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=227
146 lines
4.9 KiB
Diff
146 lines
4.9 KiB
Diff
---
|
|
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-65.5.0/pkg_resources/tests/test_markers.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/pkg_resources/tests/test_markers.py
|
|
+++ setuptools-65.5.0/pkg_resources/tests/test_markers.py
|
|
@@ -1,4 +1,4 @@
|
|
-import mock
|
|
+from . import mock
|
|
|
|
from pkg_resources import evaluate_marker
|
|
|
|
Index: setuptools-65.5.0/pkg_resources/tests/test_pkg_resources.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/pkg_resources/tests/test_pkg_resources.py
|
|
+++ setuptools-65.5.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-65.5.0/setuptools/tests/__init__.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/setuptools/tests/__init__.py
|
|
+++ setuptools-65.5.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-65.5.0/setuptools/tests/test_build_clib.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/setuptools/tests/test_build_clib.py
|
|
+++ setuptools-65.5.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-65.5.0/setuptools/tests/test_easy_install.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/setuptools/tests/test_easy_install.py
|
|
+++ setuptools-65.5.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-65.5.0/setuptools/tests/test_packageindex.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/setuptools/tests/test_packageindex.py
|
|
+++ setuptools-65.5.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-65.5.0/setuptools/tests/test_register.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/setuptools/tests/test_register.py
|
|
+++ setuptools-65.5.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-65.5.0/setuptools/tests/test_upload.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/setuptools/tests/test_upload.py
|
|
+++ setuptools-65.5.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-65.5.0/pkg_resources/tests/__init__.py
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ setuptools-65.5.0/pkg_resources/tests/__init__.py
|
|
@@ -0,0 +1,4 @@
|
|
+try:
|
|
+ import mock
|
|
+except ImportError:
|
|
+ from unittest import mock
|
|
Index: setuptools-65.5.0/setuptools/tests/test_bdist_deprecations.py
|
|
===================================================================
|
|
--- setuptools-65.5.0.orig/setuptools/tests/test_bdist_deprecations.py
|
|
+++ setuptools-65.5.0/setuptools/tests/test_bdist_deprecations.py
|
|
@@ -1,6 +1,6 @@
|
|
"""develop tests
|
|
"""
|
|
-import mock
|
|
+from . import mock
|
|
import sys
|
|
|
|
import pytest
|