intermediate changes

ref:ceeec27152a9bf5c4e5085ccf698f679946da418

6 files changed, 17 insertions, 19 deletions

diff --git a/build/ya.conf.json b/build/ya.conf.json
index d53705fdbb0..0f8b7a6b01c 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -7606,7 +7606,7 @@
         },
         "horadric": {
             "formula": {
-                "sandbox_id": 1247986783,
+                "sandbox_id": 1249130209,
                 "match": "horadric"
             },
             "executable": {
@@ -7749,7 +7749,7 @@
         },
         "apphost": {
             "formula": {
-                "sandbox_id": 1247988158,
+                "sandbox_id": 1249129646,
                 "match": "app_host_launcher"
             },
             "executable": {
@@ -8403,7 +8403,7 @@
         },
         "bigb_request": {
             "formula": {
-                "sandbox_id": 1247987126,
+                "sandbox_id": 1249129955,
                 "match": "bb_requester"
             },
             "executable": {
@@ -8414,7 +8414,7 @@
         },
         "bigb_hitlog_analyser": {
             "formula": {
-                "sandbox_id": 1247989393,
+                "sandbox_id": 1249127978,
                 "match": "hitlog_analyser"
             },
             "executable": {
@@ -8436,7 +8436,7 @@
         },
         "bigb_bb_cluster_analyzer": {
             "formula": {
-                "sandbox_id": 1247990082,
+                "sandbox_id": 1249130226,
                 "match": "bb_cluster_analyzer"
             },
             "executable": {
@@ -8458,7 +8458,7 @@
         },
         "bigb_ab": {
             "formula": {
-                "sandbox_id": 1247991260,
+                "sandbox_id": 1249127952,
                 "match": "ab"
             },
             "executable": {
@@ -8482,7 +8482,7 @@
         },
         "caesar_yt_sync": {
             "formula": {
-                "sandbox_id": 1247990172,
+                "sandbox_id": 1249129621,
                 "match": "yt_sync"
             },
             "executable": {
@@ -8493,7 +8493,7 @@
         },
         "caesar_lookup_profile": {
             "formula": {
-                "sandbox_id": 1246809314,
+                "sandbox_id": 1249128411,
                 "match": "lookup_profile"
             },
             "executable": {
@@ -8504,7 +8504,7 @@
         },
         "exp_stats": {
             "formula": {
-                "sandbox_id": 1247988339,
+                "sandbox_id": 1249129969,
                 "match": "exp_stats"
             },
             "executable": {
@@ -8526,7 +8526,7 @@
         },
         "caesar_profile_size_analyzer": {
             "formula": {
-                "sandbox_id": 1247988467,
+                "sandbox_id": 1249129600,
                 "match": "profile_size_analyzer"
             },
             "executable": {
diff --git a/contrib/libs/poco/Foundation/include/Poco/DeflatingStream.h b/contrib/libs/poco/Foundation/include/Poco/DeflatingStream.h
index 5c7b489eadc..b36ddcb0372 100644
--- a/contrib/libs/poco/Foundation/include/Poco/DeflatingStream.h
+++ b/contrib/libs/poco/Foundation/include/Poco/DeflatingStream.h
@@ -23,7 +23,7 @@
 #include <istream>
 #include <ostream>
 #if defined(POCO_UNBUNDLED)
-#include <contrib/libs/zlib/zlib.h>
+#include <zlib.h>
 #else
 #error #include "Poco/zlib.h"
 #endif
diff --git a/contrib/python/pytest/py3/.dist-info/METADATA b/contrib/python/pytest/py3/.dist-info/METADATA
index 68b4160d363..4ea30c4b7dd 100644
--- a/contrib/python/pytest/py3/.dist-info/METADATA
+++ b/contrib/python/pytest/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest
-Version: 7.1.0
+Version: 7.1.1
 Summary: pytest: simple powerful testing with Python
 Home-page: https://docs.pytest.org/en/latest/
 Author: Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others
diff --git a/contrib/python/pytest/py3/_pytest/_version.py b/contrib/python/pytest/py3/_pytest/_version.py
index 8a09b04a9d2..5fe9be4576d 100644
--- a/contrib/python/pytest/py3/_pytest/_version.py
+++ b/contrib/python/pytest/py3/_pytest/_version.py
@@ -1,5 +1,5 @@
 # coding: utf-8
 # file generated by setuptools_scm
 # don't change, don't track in version control
-version = '7.1.0'
-version_tuple = (7, 1, 0)
+version = '7.1.1'
+version_tuple = (7, 1, 1)
diff --git a/contrib/python/pytest/py3/_pytest/config/__init__.py b/contrib/python/pytest/py3/_pytest/config/__init__.py
index f4818c861cf..91ad3f094ff 100644
--- a/contrib/python/pytest/py3/_pytest/config/__init__.py
+++ b/contrib/python/pytest/py3/_pytest/config/__init__.py
@@ -538,11 +538,7 @@ class PytestPluginManager(PluginManager):
         """
         if self._confcutdir is None:
             return True
-        try:
-            path.relative_to(self._confcutdir)
-        except ValueError:
-            return False
-        return True
+        return path not in self._confcutdir.parents
 
     def _try_load_conftest(
         self, anchor: Path, importmode: Union[str, ImportMode], rootpath: Path
diff --git a/contrib/tools/python3/src/Include/internal/pycore_condvar.h b/contrib/tools/python3/src/Include/internal/pycore_condvar.h
index 8b89d709510..95e3358b355 100644
--- a/contrib/tools/python3/src/Include/internal/pycore_condvar.h
+++ b/contrib/tools/python3/src/Include/internal/pycore_condvar.h
@@ -35,7 +35,9 @@
 #define Py_HAVE_CONDVAR
 
 /* include windows if it hasn't been done before */
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 /* options */