From d96fa07134c06472bfee6718b5cfd1679196fc99 Mon Sep 17 00:00:00 2001 From: thegeorg Date: Mon, 19 Feb 2024 02:38:52 +0300 Subject: Sync contrib/tools/python3 layout with upstream * Move src/ subdir contents to the top of the layout * Rename self-written lib -> lib2 to avoid CaseFolding warning from the VCS * Regenerate contrib/libs/python proxy-headers accordingly 4ccc62ac1511abcf0fed14ccade38e984e088f1e --- library/python/runtime_py3/importer.pxi | 2 +- library/python/runtime_py3/main/main.c | 2 +- library/python/runtime_py3/main/ya.make | 4 ++-- library/python/runtime_py3/ya.make | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'library/python') diff --git a/library/python/runtime_py3/importer.pxi b/library/python/runtime_py3/importer.pxi index 0a194308c3a..0bef940b709 100644 --- a/library/python/runtime_py3/importer.pxi +++ b/library/python/runtime_py3/importer.pxi @@ -17,7 +17,7 @@ res_ya_ide_venv = b'YA_IDE_VENV' executable = sys.executable or 'Y_PYTHON' sys.modules['run_import_hook'] = __resource -# This is the prefix in contrib/tools/python3/src/Lib/ya.make. +# This is the prefix in contrib/tools/python3/Lib/ya.make. py_prefix = b'py/' py_prefix_len = len(py_prefix) diff --git a/library/python/runtime_py3/main/main.c b/library/python/runtime_py3/main/main.c index bf80678d260..896ab0b21d0 100644 --- a/library/python/runtime_py3/main/main.c +++ b/library/python/runtime_py3/main/main.c @@ -1,5 +1,5 @@ #include -#include // _PyRuntime_Initialize() +#include // _PyRuntime_Initialize() #include #include diff --git a/library/python/runtime_py3/main/ya.make b/library/python/runtime_py3/main/ya.make index bfd0955b0f1..13449602a9d 100644 --- a/library/python/runtime_py3/main/ya.make +++ b/library/python/runtime_py3/main/ya.make @@ -1,12 +1,12 @@ LIBRARY() PEERDIR( - contrib/tools/python3/src + contrib/tools/python3 library/cpp/resource ) ADDINCL( - contrib/tools/python3/src/Include + contrib/tools/python3/Include ) CFLAGS( diff --git a/library/python/runtime_py3/ya.make b/library/python/runtime_py3/ya.make index 58e05a72951..05687fdd8fc 100644 --- a/library/python/runtime_py3/ya.make +++ b/library/python/runtime_py3/ya.make @@ -3,8 +3,8 @@ PY3_LIBRARY() STYLE_PYTHON() PEERDIR( - contrib/tools/python3/src - contrib/tools/python3/lib/py + contrib/tools/python3 + contrib/tools/python3/lib2/py library/cpp/resource ) -- cgit v1.3