diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-19 21:03:47 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-19 21:03:47 +0300 |
| commit | e93e00c9b7cceb60175c1e14bddcf5cc0bb1c0ee (patch) | |
| tree | dbc46227717dd2a816d3fde8101d00a3ec9de90f /contrib | |
| parent | cc49c847a508414f54b411230615572f7aa20a14 (diff) | |
| download | ydb-e93e00c9b7cceb60175c1e14bddcf5cc0bb1c0ee.tar.gz | |
intermediate changes
ref:ceeec27152a9bf5c4e5085ccf698f679946da418
Diffstat (limited to 'contrib')
5 files changed, 7 insertions, 9 deletions
diff --git a/contrib/libs/poco/Foundation/include/Poco/DeflatingStream.h b/contrib/libs/poco/Foundation/include/Poco/DeflatingStream.h index 5c7b489ead..b36ddcb037 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 68b4160d36..4ea30c4b7d 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 8a09b04a9d..5fe9be4576 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 f4818c861c..91ad3f094f 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 8b89d70951..95e3358b35 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 */ |