Matej Cepl
520bb94f3d
- Update to version 63.1.0 * #3430: Merge with pypa/distutils@152c13d including pypa/distutils#155 (improved compatibility for editable installs on homebrew Python 3.9), pypa/distutils#150 (better handling of runtime_library_dirs on cygwin), and pypa/distutils#151 (remove warnings for namespace packages). - v63.0.0 * #3421: Drop setuptools' support for installing an entrypoint extra requirements at load time: - the functionality has been broken since v60.8.0. - the mechanism to do so is deprecated (fetch_build_eggs). - that use case (e.g. a custom command class entrypoint) is covered by making sure the necessary build requirements are declared. Documentation changes * #3397: Fix reference for keywords to point to the Core Metadata Specification instead of PEP 314 (the live standard is kept always up-to-date and consolidates several PEPs together in a single document). - v62.6.0 * #3253: Enabled using file: for requirements in setup.cfg -- by :user:`akx` (this feature is currently considered to be in beta stage). * #3255: Enabled using file: for dependencies and optional-dependencies in pyproject.toml -- by :user:`akx` (this feature is currently considered to be in beta stage). * #3391: Updated attr: to also extract simple constants with type annotations -- by :user:`karlotness` - v62.5.0 * #3347: Changed warnings and documentation notes about experimental aspect of pyproject.toml configuration: now OBS-URL: https://build.opensuse.org/request/show/989053 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=223
159 lines
5.2 KiB
Diff
159 lines
5.2 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-63.1.0/pkg_resources/tests/test_markers.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/pkg_resources/tests/test_markers.py
|
|
+++ setuptools-63.1.0/pkg_resources/tests/test_markers.py
|
|
@@ -1,4 +1,4 @@
|
|
-import mock
|
|
+from . import mock
|
|
|
|
from pkg_resources import evaluate_marker
|
|
|
|
Index: setuptools-63.1.0/pkg_resources/tests/test_pkg_resources.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/pkg_resources/tests/test_pkg_resources.py
|
|
+++ setuptools-63.1.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-63.1.0/setuptools/tests/__init__.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/__init__.py
|
|
+++ setuptools-63.1.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-63.1.0/setuptools/tests/test_build_clib.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_build_clib.py
|
|
+++ setuptools-63.1.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-63.1.0/setuptools/tests/test_easy_install.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_easy_install.py
|
|
+++ setuptools-63.1.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-63.1.0/setuptools/tests/test_msvc.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_msvc.py
|
|
+++ setuptools-63.1.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-63.1.0/setuptools/tests/test_packageindex.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_packageindex.py
|
|
+++ setuptools-63.1.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-63.1.0/setuptools/tests/test_register.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_register.py
|
|
+++ setuptools-63.1.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-63.1.0/setuptools/tests/test_upload.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_upload.py
|
|
+++ setuptools-63.1.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-63.1.0/pkg_resources/tests/__init__.py
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ setuptools-63.1.0/pkg_resources/tests/__init__.py
|
|
@@ -0,0 +1,4 @@
|
|
+try:
|
|
+ import mock
|
|
+except ImportError:
|
|
+ from unittest import mock
|
|
Index: setuptools-63.1.0/setuptools/tests/test_bdist_deprecations.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_bdist_deprecations.py
|
|
+++ setuptools-63.1.0/setuptools/tests/test_bdist_deprecations.py
|
|
@@ -1,6 +1,6 @@
|
|
"""develop tests
|
|
"""
|
|
-import mock
|
|
+from . import mock
|
|
import sys
|
|
|
|
import pytest
|