wip merging in beeprint

.github/workflows/ci.yaml

@@ -20,5 +20,5 @@ jobs:
       - name: Test
         shell: 'script -q -e -c "bash {0}"'
         run: |
-          stty cols 90
-          pytest
+          stty cols 100
+          COLUMNS=100 pytest

.python-version

@@ -0,0 +1 @@
+3.11

HISTORY.rst

@@ -1,6 +1,13 @@
 History
 -------
 
+* WARNING: history poorly maintained.
+
+0.8 (2023-10)
+~~~~~~~~~~~~
+
+* merge in pytest-beeprint fork.  thanks!
+
 0.3 (2020-01-28)
 ~~~~~~~~~~~~~~~~
 

pytest_icdiff.py

@@ -1,13 +1,18 @@
 # pylint: disable=inconsistent-return-statements
 import shutil
-from pprintpp import pformat
+
 import icdiff
+from beeprint import pp
 
 COLS = shutil.get_terminal_size().columns
 MARGIN_L = 10
 GUTTER = 2
 MARGINS = MARGIN_L + GUTTER + 1
 
+def pformat(*args, **kwargs) -> str:  # temporary wrapper to minimise diff
+    return pp(*args, **kwargs, output=False)
+
+
 # def _debug(*things):
 #     with open('/tmp/icdiff-debug.txt', 'a') as f:
 #         f.write(' '.join(str(thing) for thing in things))

setup.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import os
 import codecs
+import os
+
 from setuptools import setup
 
 
@@ -13,7 +14,7 @@ def read(fname):
 
 setup(
     name="pytest-icdiff",
-    version="0.7",
+    version="0.8",
     author="Harry Percival",
     author_email="[email protected]",
     maintainer="Harry Percival",
@@ -25,7 +26,7 @@ def read(fname):
     long_description_content_type="text/x-rst",
     py_modules=["pytest_icdiff"],
     python_requires=">=3.7",
-    install_requires=["pytest", "icdiff", "pprintpp"],
+    install_requires=["pytest", "icdiff", "beeprint"],
     classifiers=[
         "Development Status :: 4 - Beta",
         "Framework :: Pytest",

tests/conftest.py

@@ -1 +1 @@
-pytest_plugins = 'pytester'
+pytest_plugins = "pytester"

tests/test_pytest_icdiff.py

@@ -2,7 +2,7 @@
 from unittest import mock
 import pytest
 import re
-from pprintpp import pformat
+from beeprint import pp
 
 YELLOW_ON = '\x1b[1;33m'
 COLOR_OFF = '\x1b[m'
@@ -159,8 +159,8 @@ def test_thing():
     )
     output = testdir.runpytest('--color=yes').stdout.str()
     expected = list(icdiff.ConsoleDiff().make_table(
-        pformat(one, width=1).splitlines(),
-        pformat(two, width=1).splitlines(),
+        pp(one, width=1, output=False).splitlines(),
+        pp(two, width=1, output=False).splitlines(),
     ))
     print('\n'.join(repr(l) for l in output.splitlines()))
     _assert_line_in_ignoring_whitespace(expected[0], output)