* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/files/
@ 2021-09-14 13:57 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2021-09-14 13:57 UTC (permalink / raw
To: gentoo-commits
commit: b146111a9dd0deb8993a7f244dca6d59edc69e01
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 14 11:18:54 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 13:56:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b146111a
dev-python/pytest: remove unused patch
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22295
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../pytest/files/pytest-4.6.10-timeout.patch | 35 ----------------------
1 file changed, 35 deletions(-)
diff --git a/dev-python/pytest/files/pytest-4.6.10-timeout.patch b/dev-python/pytest/files/pytest-4.6.10-timeout.patch
deleted file mode 100644
index 5bf9bcdbd8f..00000000000
--- a/dev-python/pytest/files/pytest-4.6.10-timeout.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
-index f1d739c99..72406b85d 100644
---- a/src/_pytest/pytester.py
-+++ b/src/_pytest/pytester.py
-@@ -1209,7 +1209,7 @@ class Testdir(object):
- args = self._getpytestargs() + args
- return self.run(*args, timeout=timeout)
-
-- def spawn_pytest(self, string, expect_timeout=10.0):
-+ def spawn_pytest(self, string, expect_timeout=60.0):
- """Run pytest using pexpect.
-
- This makes sure to use the right pytest and sets up the temporary
-@@ -1223,7 +1223,7 @@ class Testdir(object):
- cmd = "%s --basetemp=%s %s" % (invoke, basetemp, string)
- return self.spawn(cmd, expect_timeout=expect_timeout)
-
-- def spawn(self, cmd, expect_timeout=10.0):
-+ def spawn(self, cmd, expect_timeout=60.0):
- """Run a command using pexpect.
-
- The pexpect child is returned.
-diff --git a/testing/test_terminal.py b/testing/test_terminal.py
-index 1b2e46c7c..52ba80f46 100644
---- a/testing/test_terminal.py
-+++ b/testing/test_terminal.py
-@@ -138,7 +138,7 @@ class TestTerminal(object):
- """
- def test_1():
- import time
-- time.sleep(20)
-+ time.sleep(120)
- """
- )
- child = testdir.spawn_pytest("")
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/files/
@ 2022-01-04 14:55 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-01-04 14:55 UTC (permalink / raw
To: gentoo-commits
commit: e021274d7bed1b9e4af0b4e999582a5b2225579a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan 2 15:48:31 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 14:55:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e021274d
dev-python/pytest: remove unused patch(es)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../files/pytest-4.5.0-strip-setuptools_scm.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch b/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch
deleted file mode 100644
index ae6be933bca6..000000000000
--- a/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0fb5a58a..302b5dda 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,5 @@
- from setuptools import setup
-+import os
-
- # TODO: if py gets upgrade to >=1.6,
- # remove _width_of_current_line in terminal.py
-@@ -18,10 +19,12 @@ INSTALL_REQUIRES = [
- ]
-
-
-+with open("src/_pytest/_version.py", 'wt') as fp:
-+ fp.write('version = "{}"'.format(os.environ['PV']))
-+
- def main():
- setup(
-- use_scm_version={"write_to": "src/_pytest/_version.py"},
-- setup_requires=["setuptools-scm", "setuptools>=40.0"],
-+ version=os.environ['PV'],
- package_dir={"": "src"},
- # fmt: off
- extras_require={
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/files/
@ 2025-05-03 6:08 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2025-05-03 6:08 UTC (permalink / raw
To: gentoo-commits
commit: f2ce654aa3f8e9848a0819f02d4b0a573341f12e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri May 2 20:18:44 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 3 06:07:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ce654a
dev-python/pytest: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Part-of: https://github.com/gentoo/gentoo/pull/41906
Closes: https://github.com/gentoo/gentoo/pull/41906
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../pytest/files/pytest-8.3.4-pygments-2.19.patch | 106 ---------------------
1 file changed, 106 deletions(-)
diff --git a/dev-python/pytest/files/pytest-8.3.4-pygments-2.19.patch b/dev-python/pytest/files/pytest-8.3.4-pygments-2.19.patch
deleted file mode 100644
index 5674f72ead18..000000000000
--- a/dev-python/pytest/files/pytest-8.3.4-pygments-2.19.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From ad4081f63985ff42f54fc52baa7ce0e7b5cffba4 Mon Sep 17 00:00:00 2001
-From: Florian Bruhin <me@the-compiler.org>
-Date: Wed, 8 Jan 2025 18:04:15 +0100
-Subject: [PATCH] Merge pull request #13113 from
- The-Compiler/fix-pygments-whitespace
-
-Fix selftests with Pygments >= 2.19.0
-
-(cherry picked from commit bdfc3a99bd733f385f150446caef6d5843bb6418)
----
- changelog/13112.contrib.rst | 1 +
- testing/conftest.py | 7 +++++++
- testing/test_terminal.py | 10 +++++-----
- 3 files changed, 13 insertions(+), 5 deletions(-)
- create mode 100644 changelog/13112.contrib.rst
-
-diff --git a/changelog/13112.contrib.rst b/changelog/13112.contrib.rst
-new file mode 100644
-index 000000000..5e59a736e
---- /dev/null
-+++ b/changelog/13112.contrib.rst
-@@ -0,0 +1 @@
-+Fixed selftest failures in ``test_terminal.py`` with Pygments >= 2.19.0
-diff --git a/testing/conftest.py b/testing/conftest.py
-index 69af03324..194da0f83 100644
---- a/testing/conftest.py
-+++ b/testing/conftest.py
-@@ -2,10 +2,13 @@
- from __future__ import annotations
-
- import dataclasses
-+import importlib.metadata
- import re
- import sys
- from typing import Generator
-
-+from packaging.version import Version
-+
- from _pytest.monkeypatch import MonkeyPatch
- from _pytest.pytester import Pytester
- import pytest
-@@ -168,6 +171,9 @@ def color_mapping():
-
- Used by tests which check the actual colors output by pytest.
- """
-+ # https://github.com/pygments/pygments/commit/d24e272894a56a98b1b718d9ac5fabc20124882a
-+ pygments_version = Version(importlib.metadata.version("pygments"))
-+ pygments_has_kwspace_hl = pygments_version >= Version("2.19")
-
- class ColorMapping:
- COLORS = {
-@@ -180,6 +186,7 @@ def color_mapping():
- "bold": "\x1b[1m",
- "reset": "\x1b[0m",
- "kw": "\x1b[94m",
-+ "kwspace": "\x1b[90m \x1b[39;49;00m" if pygments_has_kwspace_hl else " ",
- "hl-reset": "\x1b[39;49;00m",
- "function": "\x1b[92m",
- "number": "\x1b[94m",
-diff --git a/testing/test_terminal.py b/testing/test_terminal.py
-index 14c152d61..cbbe9cbd7 100644
---- a/testing/test_terminal.py
-+++ b/testing/test_terminal.py
-@@ -1299,13 +1299,13 @@ def test_color_yes(pytester: Pytester, color_mapping) -> None:
- "=*= FAILURES =*=",
- "{red}{bold}_*_ test_this _*_{reset}",
- "",
-- " {reset}{kw}def{hl-reset} {function}test_this{hl-reset}():{endline}",
-+ " {reset}{kw}def{hl-reset}{kwspace}{function}test_this{hl-reset}():{endline}",
- "> fail(){endline}",
- "",
- "{bold}{red}test_color_yes.py{reset}:5: ",
- "_ _ * _ _*",
- "",
-- " {reset}{kw}def{hl-reset} {function}fail{hl-reset}():{endline}",
-+ " {reset}{kw}def{hl-reset}{kwspace}{function}fail{hl-reset}():{endline}",
- "> {kw}assert{hl-reset} {number}0{hl-reset}{endline}",
- "{bold}{red}E assert 0{reset}",
- "",
-@@ -2585,7 +2585,7 @@ class TestCodeHighlight:
- result.stdout.fnmatch_lines(
- color_mapping.format_for_fnmatch(
- [
-- " {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
-+ " {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
- "> {kw}assert{hl-reset} {number}1{hl-reset} == {number}10{hl-reset}{endline}",
- "{bold}{red}E assert 1 == 10{reset}",
- ]
-@@ -2607,7 +2607,7 @@ class TestCodeHighlight:
- result.stdout.fnmatch_lines(
- color_mapping.format_for_fnmatch(
- [
-- " {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
-+ " {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
- " {print}print{hl-reset}({str}'''{hl-reset}{str}{hl-reset}",
- "> {str} {hl-reset}{str}'''{hl-reset}); {kw}assert{hl-reset} {number}0{hl-reset}{endline}",
- "{bold}{red}E assert 0{reset}",
-@@ -2630,7 +2630,7 @@ class TestCodeHighlight:
- result.stdout.fnmatch_lines(
- color_mapping.format_for_fnmatch(
- [
-- " {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
-+ " {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
- "> {kw}assert{hl-reset} {number}1{hl-reset} == {number}10{hl-reset}{endline}",
- "{bold}{red}E assert 1 == 10{reset}",
- ]
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-03 6:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-03 6:08 [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-01-04 14:55 Andrew Ammerlaan
2021-09-14 13:57 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox