public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/snapshottest/files/
@ 2022-06-21 10:55 Andrew Ammerlaan
  0 siblings, 0 replies; only message in thread
From: Andrew Ammerlaan @ 2022-06-21 10:55 UTC (permalink / raw
  To: gentoo-commits

commit:     c400b5b5f554e3bb19899a948c2fcdb16915b888
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jun 20 08:57:53 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 10:55:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c400b5b5

dev-python/snapshottest: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25994
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../files/snapshottest-0.5.1-remove-fastdiff.patch | 57 ----------------------
 1 file changed, 57 deletions(-)

diff --git a/dev-python/snapshottest/files/snapshottest-0.5.1-remove-fastdiff.patch b/dev-python/snapshottest/files/snapshottest-0.5.1-remove-fastdiff.patch
deleted file mode 100644
index ec12f15fe7a6..000000000000
--- a/dev-python/snapshottest/files/snapshottest-0.5.1-remove-fastdiff.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3e31b54d349eb136f0d96eb81309fdaf4ad35fcf Mon Sep 17 00:00:00 2001
-From: David Shepherd <davidshepherd7@gmail.com>
-Date: Sat, 15 Feb 2020 11:48:52 +0000
-Subject: [PATCH] Revert "Use fastdiff for faster diffing"
-
-This reverts commit 56d9efdaa37c39c7f644726e0d34c89b09ff9568.
----
- setup.py             | 2 +-
- snapshottest/diff.py | 9 +++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 1baefd8..690713e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -23,7 +23,7 @@
-         'nose.plugins.0.10':
-         ['snapshottest = snapshottest.nose:SnapshotTestPlugin']
-     },
--    install_requires=['six>=1.10.0', 'termcolor', 'fastdiff>=0.1.4<1'],
-+    install_requires=['six>=1.10.0', 'termcolor'],
-     tests_require=tests_require,
-     extras_require={
-         'test': tests_require,
-diff --git a/snapshottest/diff.py b/snapshottest/diff.py
-index 5fddf66..83c599a 100644
---- a/snapshottest/diff.py
-+++ b/snapshottest/diff.py
-@@ -1,5 +1,5 @@
-+from difflib import Differ
- from termcolor import colored
--from fastdiff import compare
- 
- from .sorted_dict import SortedDict
- from .formatter import Formatter
-@@ -23,6 +23,7 @@ def format_line(line):
- class PrettyDiff(object):
-     def __init__(self, obj, snapshottest):
-         self.pretty = Formatter()
-+        self.differ = Differ()
-         self.snapshottest = snapshottest
-         if isinstance(obj, dict):
-             obj = SortedDict(**obj)
-@@ -35,10 +36,10 @@ def __repr__(self):
-         return repr(self.obj)
- 
-     def get_diff(self, other):
--        text1 = 'Received \n\n' + self.pretty(self.obj)
--        text2 = 'Snapshot \n\n' + self.pretty(other)
-+        text1 = ['Received ', ''] + self.pretty(self.obj).splitlines(1)
-+        text2 = ['Snapshot ', ''] + self.pretty(other).splitlines(1)
- 
--        lines = list(compare(text2, text1))
-+        lines = list(self.differ.compare(text2, text1))
-         return [
-             format_line(line) for line in lines
-         ]


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2022-06-21 10:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-21 10:55 [gentoo-commits] repo/gentoo:master commit in: dev-python/snapshottest/files/ Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox