diff options
author | Alexander Smirnov <alex@ydb.tech> | 2024-07-30 19:23:14 +0000 |
---|---|---|
committer | Alexander Smirnov <alex@ydb.tech> | 2024-07-30 19:23:14 +0000 |
commit | 40beacac031f579786f8b26aa16c59486dbab2b0 (patch) | |
tree | 12a1548bbf15daf6e931eaca2fcd6a9e618d0356 /contrib/python/setuptools/py3 | |
parent | ea1b205d749cc1c3e37c7ae42817534ede33e390 (diff) | |
parent | f7ca71b582e2347ec55857b493d6bccf55bbc3df (diff) | |
download | ydb-40beacac031f579786f8b26aa16c59486dbab2b0.tar.gz |
Merge branch 'rightlib' into mergelibs-240730-1922
Diffstat (limited to 'contrib/python/setuptools/py3')
4 files changed, 27 insertions, 4 deletions
diff --git a/contrib/python/setuptools/py3/.dist-info/METADATA b/contrib/python/setuptools/py3/.dist-info/METADATA index 6500c47bd1..90eca520d0 100644 --- a/contrib/python/setuptools/py3/.dist-info/METADATA +++ b/contrib/python/setuptools/py3/.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: setuptools -Version: 70.2.0 +Version: 70.3.0 Summary: Easily download, build, install, upgrade, and uninstall Python packages Author-email: Python Packaging Authority <distutils-sig@python.org> Project-URL: Source, https://github.com/pypa/setuptools diff --git a/contrib/python/setuptools/py3/_distutils_hack/__init__.py b/contrib/python/setuptools/py3/_distutils_hack/__init__.py index 4d3f09b0ae..35ab5cad49 100644 --- a/contrib/python/setuptools/py3/_distutils_hack/__init__.py +++ b/contrib/python/setuptools/py3/_distutils_hack/__init__.py @@ -3,6 +3,12 @@ import sys import os +report_url = ( + "https://github.com/pypa/setuptools/issues/new?" + "template=distutils-deprecation.yml" +) + + def warn_distutils_present(): if 'distutils' not in sys.modules: return @@ -23,7 +29,12 @@ def clear_distutils(): return import warnings - warnings.warn("Setuptools is replacing distutils.") + warnings.warn( + "Setuptools is replacing distutils. Support for replacing " + "an already imported distutils is deprecated. In the future, " + "this condition will fail. " + f"Register concerns at {report_url}" + ) mods = [ name for name in sys.modules @@ -38,6 +49,16 @@ def enabled(): Allow selection of distutils by environment variable. """ which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'local') + if which == 'stdlib': + import warnings + + warnings.warn( + "Reliance on distutils from stdlib is deprecated. Users " + "must rely on setuptools to provide the distutils module. " + "Avoid importing distutils or import setuptools first, " + "and avoid setting SETUPTOOLS_USE_DISTUTILS=stdlib. " + f"Register concerns at {report_url}" + ) return which == 'local' diff --git a/contrib/python/setuptools/py3/setuptools/_distutils/sysconfig.py b/contrib/python/setuptools/py3/setuptools/_distutils/sysconfig.py index 4ba0be5602..7ebe67687e 100644 --- a/contrib/python/setuptools/py3/setuptools/_distutils/sysconfig.py +++ b/contrib/python/setuptools/py3/setuptools/_distutils/sysconfig.py @@ -293,7 +293,9 @@ def customize_compiler(compiler): # noqa: C901 Mainly needed on Unix, so we can plug in the information that varies across Unices and is stored in Python's Makefile. """ - if compiler.compiler_type in ["unix", "cygwin", "mingw32"]: + if compiler.compiler_type in ["unix", "cygwin"] or ( + compiler.compiler_type == "mingw32" and is_mingw() + ): _customize_macos() ( diff --git a/contrib/python/setuptools/py3/ya.make b/contrib/python/setuptools/py3/ya.make index f4b0026586..38047edfe4 100644 --- a/contrib/python/setuptools/py3/ya.make +++ b/contrib/python/setuptools/py3/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(70.2.0) +VERSION(70.3.0) LICENSE(MIT) |