fix lint nits

Author: Ken Kundert

inform/inform.py

@@ -3424,6 +3424,7 @@ def set_culprit(self, culprit):
             warning: pyproject.toml, 25: empty line.
             warning: pyproject.toml, 37: empty line.
             warning: pyproject.toml, 43: empty line.
+            ...
 
         """
         return self.CulpritContextManager(self, culprit, append=False)

pyproject.toml

@@ -44,3 +44,18 @@ changelog = "https://github.com/KenKundert/inform/blob/master/doc/releases.rst"
 [build-system]
 requires = ["flit_core >=2,<4"]
 build-backend = "flit_core.buildapi"
+
+[tool.pytest.ini_options]
+addopts = "--tb=short"
+
+[tool.ruff]
+exclude = [".tox", "doc", "Diffs"]
+
+[tool.ruff.lint]
+select = ["F"]
+ignore = []
+
+[tool.ruff.lint.per-file-ignores]
+"inform/__init__.py" = ["F401"]
+"tests/test_debug.py" = ["F841"]
+"tests/test_utilities.py" = ["F841"]

tests/test_debug.py

@@ -1,7 +1,5 @@
 # Test Inform debug functions
 
-import builtins
-
 # Imports {{{1
 from inform import Inform, aaa, ccc, ddd, ppp, sss, vvv
 from textwrap import dedent
@@ -14,7 +12,7 @@ def test_anglicize(capsys):
     ppp()
     out, err = capsys.readouterr()
     assert out == dedent('''
-        DEBUG: test_debug.py, 14, tests.test_debug.test_anglicize()
+        DEBUG: test_debug.py, 12, tests.test_debug.test_anglicize()
     ''').lstrip()
 
 def test_grouch(capsys):
@@ -24,7 +22,7 @@ def test_grouch(capsys):
     ppp('hey now!', a, b)
     out, err = capsys.readouterr()
     assert out == dedent('''
-        DEBUG: test_debug.py, 24, tests.test_debug.test_grouch(): hey now! 0 b
+        DEBUG: test_debug.py, 22, tests.test_debug.test_grouch(): hey now! 0 b
     ''').lstrip()
 
 def test_salver(capsys):
@@ -38,7 +36,7 @@ def test_salver(capsys):
         ddd('hey now!', a, b, c, d, e)
         out, err = capsys.readouterr()
         assert out == dedent('''
-            DEBUG: test_debug.py, 38, tests.test_debug.test_salver():
+            DEBUG: test_debug.py, 36, tests.test_debug.test_salver():
                 'hey now!'
                 0
                 'b'
@@ -58,7 +56,7 @@ def test_daiquiri(capsys):
         ddd(s='hey now!', a=a, b=b, c=c, d=d, e=e)
         out, err = capsys.readouterr()
         assert out == dedent('''
-            DEBUG: test_debug.py, 58, tests.test_debug.test_daiquiri():
+            DEBUG: test_debug.py, 56, tests.test_debug.test_daiquiri():
                 a = 0
                 b = 'b'
                 c = [0, 'b']
@@ -77,7 +75,7 @@ def test_prude(capsys):
     Info(email='ted@ledbelly.com')
     out, err = capsys.readouterr()
     assert out == dedent('''
-        DEBUG: test_debug.py, 73, tests.test_debug.Info.__init__():
+        DEBUG: test_debug.py, 71, tests.test_debug.Info.__init__():
             email = 'ted@ledbelly.com'
             self = Info object containing {'email': 'ted@ledbelly.com'}
     ''').lstrip()
@@ -94,7 +92,7 @@ def test_update(capsys):
         out, err = capsys.readouterr()
         out = '\n'.join(l for l in out.split('\n') if 'capsys' not in l)
         assert out == dedent('''
-            DEBUG: test_debug.py, 93, tests.test_debug.test_update():
+            DEBUG: test_debug.py, 91, tests.test_debug.test_update():
                 a = 0
                 b = 'b'
                 c = [0, 'b']
@@ -113,7 +111,7 @@ def test_shear(capsys):
         vvv(a, b, c, d, e)
         out, err = capsys.readouterr()
         assert out == dedent('''
-            DEBUG: test_debug.py, 113, tests.test_debug.test_shear():
+            DEBUG: test_debug.py, 111, tests.test_debug.test_shear():
                 a = 0
                 b = 'b'
                 c = [0, 'b']
@@ -126,23 +124,23 @@ def test_prostrate(capsys):
     sss()
     out, err = capsys.readouterr()
     out = out.strip().split('\n')
-    assert out[0] == 'DEBUG: test_debug.py, 126, tests.test_debug.test_prostrate():'
-    assert out[-2][-50:] == "tests/test_debug.py', line 126, in test_prostrate,"
+    assert out[0] == 'DEBUG: test_debug.py, 124, tests.test_debug.test_prostrate():'
+    assert out[-2][-50:] == "tests/test_debug.py', line 124, in test_prostrate,"
     assert out[-1] == '        sss()'
 
 def test_rubber(capsys):
     Inform(colorscheme=None, prog_name=False)
     a = aaa('a')
     out, err = capsys.readouterr()
     assert out == dedent('''
-        DEBUG: test_debug.py, 135, tests.test_debug.test_rubber(): 'a'
+        DEBUG: test_debug.py, 133, tests.test_debug.test_rubber(): 'a'
     ''').lstrip()
     assert a == 'a'
 
     b = aaa(b = 'b')
     out, err = capsys.readouterr()
     assert out == dedent('''
-        DEBUG: test_debug.py, 142, tests.test_debug.test_rubber(): b: 'b'
+        DEBUG: test_debug.py, 140, tests.test_debug.test_rubber(): b: 'b'
     ''').lstrip()
     assert b == 'b'
 
@@ -152,7 +150,7 @@ def test_bartender(capsys):
     ret = aaa(b)
     out, err = capsys.readouterr()
     assert out == dedent('''
-        DEBUG: test_debug.py, 152, tests.test_debug.test_bartender(): 'b'
+        DEBUG: test_debug.py, 150, tests.test_debug.test_bartender(): 'b'
     ''').lstrip()
     assert ret == 'b'
 
@@ -161,7 +159,7 @@ def test_scene(capsys):
     ccc(msg)
     out, err = capsys.readouterr()
     assert out == dedent('''
-        DEBUG: test_debug.py, 161, tests.test_debug.test_scene(): Inform
+        DEBUG: test_debug.py, 159, tests.test_debug.test_scene(): Inform
     ''').lstrip()
 
 

tests/test_inform.py

@@ -4,7 +4,7 @@
 from inform import (
     Inform, InformantFactory, Error, codicil, dedent, display, done, error,
     errors_accrued, fatal, log, output, terminate, terminate_if_errors, warn,
-    set_culprit, add_culprit, get_culprit, join_culprit, tree
+    set_culprit, add_culprit, get_culprit, join_culprit
 )
 from contextlib import contextmanager
 import sys
@@ -301,7 +301,7 @@ def test_pardon():
             try:
                 rv = done(exit=False)
                 assert rv == 0
-            except SystemExit as e:
+            except SystemExit:
                 assert False
 
             try:
@@ -313,25 +313,25 @@ def test_pardon():
             try:
                 rv = terminate(exit=False)
                 assert rv == 1
-            except SystemExit as e:
+            except SystemExit:
                 assert False
 
             try:
                 rv = terminate(True, exit=False)
                 assert rv == 1
-            except SystemExit as e:
+            except SystemExit:
                 assert False
 
             try:
                 rv = terminate('fuxit', exit=False)
                 assert rv == 1
-            except SystemExit as e:
+            except SystemExit:
                 assert False
 
             try:
                 rv = terminate(6, exit=False)
                 assert rv == 6
-            except SystemExit as e:
+            except SystemExit:
                 assert False
 
             try:
@@ -344,7 +344,7 @@ def test_pardon():
             try:
                 rv = terminate_if_errors(exit=False)
                 assert rv == 1
-            except SystemExit as e:
+            except SystemExit:
                 assert False
 
         try:

tests/test_utilities.py

@@ -893,19 +893,19 @@ def test_join():
         dict(key='trump'),
     ]
     assert join(
-        key='abby', name='Abby Normal', desc='team captain',
-        template=('{key}: {name} -- {desc}', '{key}: {name}')
+        template=('{key}: {name} -- {desc}', '{key}: {name}'),
+        **disappointments[0]
     ) == 'abby: Abby Normal -- team captain'
 
     assert join(
-        key='dizzy', name='Dizzy Functional',
-        template=('{key}: {name} -- {desc}', '{key}: {name}')
+        template=('{key}: {name} -- {desc}', '{key}: {name}'),
+        **disappointments[1]
     ) == 'dizzy: Dizzy Functional'
 
     with pytest.raises(KeyError) as exception:
         assert join(
-            key='trump',
-            template=('{key}: {name} -- {desc}', '{key}: {name}')
+            template=('{key}: {name} -- {desc}', '{key}: {name}'),
+            **disappointments[2]
         )
     assert str(exception.value) == "'no template match.'"
 
@@ -1267,7 +1267,7 @@ def test_prog_name(capsys):
 
 def test_informer_attributes(capsys):
     with Inform(prog_name='curly', pizza=True) as informer:
-        with pytest.raises(AttributeError) as exception:
+        with pytest.raises(AttributeError):
             informer.__xxx
         assert informer.yep == None
         assert informer.prog_name == 'curly'
@@ -1681,9 +1681,8 @@ def test_paramedic(capsys):
         stop = 1e-6
         step = 1e-9
         value = 0
-        with ProgressBar(stop, prefix='Progress: ') as progress:
+        with ProgressBar(stop, prefix='Progress: '):
             while value <= stop:
-                # progress.draw(value)
                 value += step
         display('after')
         captured = capsys.readouterr()

tests/test_zdoctests.py

@@ -3,7 +3,6 @@
 # dependency that I have not been able to track down that causes the other tests
 # to fail if it goes first.
 
-import pytest
 import doctest
 import glob
 import sys

tox.ini

@@ -3,11 +3,9 @@ envlist = lint, pytest, mypy
 isolated_build = True
 
 [testenv:lint]
-deps =
-    setuptools
-    pylama
+deps = setuptools ruff
 skip_install = true
-commands = pylama --ignore C901,E116,E251,E203,E501,E741,E731 inform/*.py
+commands = ruff check
 
 # Test environment
 [testenv]