diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-14 00:49:36 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-14 00:49:36 +0300 |
| commit | 82cfd1b7cab2d843cdf5467d9737f72597a493bd (patch) | |
| tree | 1dfdcfe81a1a6b193ceacc2a828c521b657a339b /contrib/python/pytest/py3/patches | |
| parent | 3df7211d3e3691f8e33b0a1fb1764fe810d59302 (diff) | |
| download | ydb-82cfd1b7cab2d843cdf5467d9737f72597a493bd.tar.gz | |
intermediate changes
ref:68b1302de4b5da30b6bdf02193f7a2604d8b5cf8
Diffstat (limited to 'contrib/python/pytest/py3/patches')
5 files changed, 6 insertions, 6 deletions
diff --git a/contrib/python/pytest/py3/patches/03-limit-id.patch b/contrib/python/pytest/py3/patches/03-limit-id.patch index f0a57f85994..16abfefa357 100644 --- a/contrib/python/pytest/py3/patches/03-limit-id.patch +++ b/contrib/python/pytest/py3/patches/03-limit-id.patch @@ -1,6 +1,6 @@ --- contrib/python/pytest/py3/_pytest/python.py (index) +++ contrib/python/pytest/py3/_pytest/python.py (working tree) -@@ -1339,6 +1339,33 @@ def _idval(val, argname, idx, idfn, item, config): +@@ -1403,6 +1403,33 @@ def _idval(val, argname, idx, idfn, item, config): return str(argname) + str(idx) diff --git a/contrib/python/pytest/py3/patches/04-support-cyrillic-id.patch b/contrib/python/pytest/py3/patches/04-support-cyrillic-id.patch index c601f183f95..5cb6a61d611 100644 --- a/contrib/python/pytest/py3/patches/04-support-cyrillic-id.patch +++ b/contrib/python/pytest/py3/patches/04-support-cyrillic-id.patch @@ -1,6 +1,6 @@ --- contrib/python/pytest/py3/_pytest/compat.py (index) +++ contrib/python/pytest/py3/_pytest/compat.py (working tree) -@@ -233,7 +233,7 @@ if _PY3: +@@ -248,7 +248,7 @@ if _PY3: if isinstance(val, bytes): ret = _bytes_to_ascii(val) else: diff --git a/contrib/python/pytest/py3/patches/06-support-ya-markers.patch b/contrib/python/pytest/py3/patches/06-support-ya-markers.patch index 0726477fe87..c71f914537f 100644 --- a/contrib/python/pytest/py3/patches/06-support-ya-markers.patch +++ b/contrib/python/pytest/py3/patches/06-support-ya-markers.patch @@ -1,6 +1,6 @@ --- contrib/python/pytest/py3/_pytest/mark/structures.py (index) +++ contrib/python/pytest/py3/_pytest/mark/structures.py (working tree) -@@ -490,7 +490,10 @@ class MarkGenerator(object): +@@ -506,7 +506,10 @@ class MarkGenerator(object): # example lines: "skipif(condition): skip the given test if..." # or "hypothesis: tests which use Hypothesis", so to get the # marker name we split on both `:` and `(`. diff --git a/contrib/python/pytest/py3/patches/07-disable-translate-non-printable.patch b/contrib/python/pytest/py3/patches/07-disable-translate-non-printable.patch index dd81a883e81..72fe70220b6 100644 --- a/contrib/python/pytest/py3/patches/07-disable-translate-non-printable.patch +++ b/contrib/python/pytest/py3/patches/07-disable-translate-non-printable.patch @@ -1,6 +1,6 @@ --- contrib/python/pytest/py3/_pytest/compat.py (index) +++ contrib/python/pytest/py3/_pytest/compat.py (working tree) -@@ -234,7 +234,7 @@ if _PY3: +@@ -249,7 +249,7 @@ if _PY3: ret = _bytes_to_ascii(val) else: ret = val diff --git a/contrib/python/pytest/py3/patches/08-fix-win-peerdir.patch b/contrib/python/pytest/py3/patches/08-fix-win-peerdir.patch index d6a56ef6e0c..d1024bec664 100644 --- a/contrib/python/pytest/py3/patches/08-fix-win-peerdir.patch +++ b/contrib/python/pytest/py3/patches/08-fix-win-peerdir.patch @@ -1,7 +1,7 @@ --- contrib/python/pytest/py3/ya.make (index) +++ contrib/python/pytest/py3/ya.make (working tree) -@@ -15,6 +15,12 @@ PEERDIR( - contrib/python/wcwidth +@@ -17,6 +17,12 @@ PEERDIR( + contrib/python/tomli ) +IF (OS_WINDOWS) |