From 3df02058fb3d48a999bbc8d5d56c2910fbc249a4 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 24 Mar 2024 23:37:14 +0100
Subject: [PATCH] meld: update to 3.22.2
---
components/python/tox/patches/06-no-diff-cover.patch | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/components/python/tox/patches/06-no-diff-cover.patch b/components/python/tox/patches/06-no-diff-cover.patch
index e8d2bc6..bdb3729 100644
--- a/components/python/tox/patches/06-no-diff-cover.patch
+++ b/components/python/tox/patches/06-no-diff-cover.patch
@@ -1,7 +1,7 @@
We cannot compare against origin/main branch because we build from sdist, not git.
---- tox-4.14.1/tox.ini.orig
-+++ tox-4.14.1/tox.ini
+--- tox-4.14.2/tox.ini.orig
++++ tox-4.14.2/tox.ini
@@ -34,7 +34,6 @@
--cov-report xml:{toxworkdir}{/}coverage.{envname}.xml \
-n={env:PYTEST_XDIST_AUTO_NUM_WORKERS:auto} \
@@ -10,8 +10,8 @@
[testenv:fix]
description = format the code base to adhere to our styles, and complain about what we cannot do automatically
---- tox-4.14.1/pyproject.toml.orig
-+++ tox-4.14.1/pyproject.toml
+--- tox-4.14.2/pyproject.toml.orig
++++ tox-4.14.2/pyproject.toml
@@ -74,7 +74,6 @@
"build[virtualenv]>=1.0.3",
"covdefaults>=2.3",
@@ -20,3 +20,13 @@
"distlib>=0.3.8",
"flaky>=3.7",
"hatch-vcs>=0.4",
+--- tox-4.14.2/PKG-INFO.orig
++++ tox-4.14.2/PKG-INFO
+@@ -54,7 +54,6 @@
+ Requires-Dist: build[virtualenv]>=1.0.3; extra == 'testing'
+ Requires-Dist: covdefaults>=2.3; extra == 'testing'
+ Requires-Dist: detect-test-pollution>=1.2; extra == 'testing'
+-Requires-Dist: diff-cover>=8.0.2; extra == 'testing'
+ Requires-Dist: distlib>=0.3.8; extra == 'testing'
+ Requires-Dist: flaky>=3.7; extra == 'testing'
+ Requires-Dist: hatch-vcs>=0.4; extra == 'testing'
--
Gitblit v1.9.3