aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-07-25 22:24:09 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2024-07-25 22:32:20 +0300
commit9b5ec0cdb8b0d5accdbbae8203a8d21f92d2d790 (patch)
treecea9de21a912a049ded0e6918f80f93493fe03b9
parent790f370a8a0bea0631222fd07a2ff26a8536d58a (diff)
downloadydb-9b5ec0cdb8b0d5accdbbae8203a8d21f92d2d790.tar.gz
Intermediate changes
-rw-r--r--contrib/python/setuptools/py3/.dist-info/METADATA2
-rw-r--r--contrib/python/setuptools/py3/_distutils_hack/__init__.py23
-rw-r--r--contrib/python/setuptools/py3/setuptools/_distutils/sysconfig.py4
-rw-r--r--contrib/python/setuptools/py3/ya.make2
-rw-r--r--library/python/cyson/cyson/helpers.cpp6
5 files changed, 32 insertions, 5 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)
diff --git a/library/python/cyson/cyson/helpers.cpp b/library/python/cyson/cyson/helpers.cpp
index ae4a5dd2fa..0d273a0d05 100644
--- a/library/python/cyson/cyson/helpers.cpp
+++ b/library/python/cyson/cyson/helpers.cpp
@@ -161,7 +161,11 @@ namespace NCYson {
}
TPyObjectPtr::~TPyObjectPtr() {
-#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 13
+ if (Py_IsFinalizing()) {
+ return;
+ }
+#elif PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7
if (_Py_IsFinalizing()) {
return;
}