Use ruff

.github/workflows/main.yml

@@ -57,6 +57,8 @@ jobs:
       - uses: hynek/setup-cached-uv@v2
 
       - name: Run tox
+        env:
+          RUFF_OUTPUT_FORMAT: github
         run: >
           uvx --with=tox-uv --with=tox-gh-actions
           tox run --installpkg dist/*.whl

doc/conf.py

@@ -1,3 +1,5 @@
+from honcho import __version__
+
 # -*- coding: utf-8 -*-
 #
 # honcho documentation build configuration file, created by
@@ -11,7 +13,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -48,7 +49,6 @@
 # built documents.
 #
 # The short X.Y version.
-from honcho import __version__
 version = __version__
 # The full version, including alpha/beta/rc tags.
 release = __version__

honcho/command.py

@@ -3,18 +3,15 @@
 import logging
 import os
 import shlex
-import sys
 import signal
-from collections import ChainMap
-from collections import OrderedDict
-from collections import defaultdict
+import sys
+from collections import ChainMap, OrderedDict, defaultdict
 
-from honcho import __version__
+from honcho import __version__, compat, environ
 from honcho.environ import Env
-from honcho.process import Popen
 from honcho.manager import Manager
 from honcho.printer import Printer
-from honcho import compat, environ
+from honcho.process import Popen
 
 if sys.version_info < (3, 10):
     from backports.entry_points_selectable import entry_points

honcho/environ.py

@@ -1,10 +1,7 @@
-from collections import OrderedDict
-from collections import defaultdict
-from collections import namedtuple
-import shlex
 import os
 import re
-
+import shlex
+from collections import OrderedDict, defaultdict, namedtuple
 
 PROCFILE_LINE = re.compile(r'^([A-Za-z0-9_-]+):\s*(.+)$')
 

honcho/export/runit.py

@@ -1,9 +1,8 @@
 import os
+
 import jinja2
 
-from honcho.export.base import BaseExport
-from honcho.export.base import File
-from honcho.export.base import dashrepl
+from honcho.export.base import BaseExport, File, dashrepl
 
 
 class Export(BaseExport):

honcho/export/supervisord.py

@@ -1,7 +1,6 @@
 import jinja2
 
-from honcho.export.base import BaseExport
-from honcho.export.base import File
+from honcho.export.base import BaseExport, File
 
 
 class Export(BaseExport):

honcho/export/systemd.py

@@ -2,9 +2,7 @@
 
 import jinja2
 
-from honcho.export.base import BaseExport
-from honcho.export.base import File
-from honcho.export.base import dashrepl
+from honcho.export.base import BaseExport, File, dashrepl
 
 
 class Export(BaseExport):

honcho/export/upstart.py

@@ -2,9 +2,7 @@
 
 import jinja2
 
-from honcho.export.base import BaseExport
-from honcho.export.base import File
-from honcho.export.base import dashrepl
+from honcho.export.base import BaseExport, File, dashrepl
 
 
 class Export(BaseExport):

honcho/manager.py

@@ -1,13 +1,13 @@
 import datetime
-import queue
 import multiprocessing
+import queue
 import signal
 import sys
 
 from .colour import get_colours
 from .compat import ProcessManager
+from .printer import Message, Printer
 from .process import Process
-from .printer import Printer, Message
 
 KILL_WAIT = 5
 SIGNALS = {

honcho/printer.py

@@ -1,5 +1,5 @@
-from collections import namedtuple
 import sys
+from collections import namedtuple
 
 from .compat import ON_WINDOWS
 
@@ -76,7 +76,7 @@ def _colour_string(colour, s):
     try:
         import colorama
     except ImportError:
-        def _colour_string(colour, s):  # noqa
+        def _colour_string(colour, s):
             return s
     else:
         colorama.init()

pyproject.toml

@@ -48,6 +48,10 @@ supervisord = "honcho.export.supervisord:Export"
 systemd = "honcho.export.systemd:Export"
 upstart = "honcho.export.upstart:Export"
 
+[tool.ruff]
+format.exclude = ["honcho/_version.py"]
+lint.select = ["E4", "E7", "E9", "F", "I", "N", "RUF"]
+
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["honcho*"]

tests/conftest.py

@@ -31,7 +31,7 @@ def path(self, *args):
 
     def run_honcho(self, args):
         result = subprocess.run(
-            ['honcho'] + args,
+            ['honcho', *args],
             cwd=self.root,
             stdout=PIPE,
             stderr=PIPE,

tests/integration/test_main.py

@@ -1,6 +1,7 @@
-import pytest
 import textwrap
 
+import pytest
+
 
 @pytest.mark.parametrize('testenv', [{
     'Procfile': textwrap.dedent("""

tests/integration/test_start.py

@@ -1,5 +1,5 @@
-import textwrap
 import sys
+import textwrap
 
 import pytest
 

tests/test_environ.py

@@ -88,8 +88,8 @@
         # Unicode values
         r"""
         MYVAR=⋃ñᴉ—☪ó∂ǝ
-        """,
-        {'MYVAR': '⋃ñᴉ—☪ó∂ǝ'}
+        """,  # noqa: RUF001
+        {'MYVAR': '⋃ñᴉ—☪ó∂ǝ'}  # noqa: RUF001
     ],
     [
         # Unicode keys

tests/test_export_base.py

@@ -1,12 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from mock import Mock
-from mock import patch
 import pytest
+from mock import Mock, patch
 
-from honcho.export.base import BaseExport
-from honcho.export.base import dashrepl
-from honcho.export.base import percentescape
+from honcho.export.base import BaseExport, dashrepl, percentescape
 
 
 class GiraffeExport(BaseExport):

tests/test_export_runit.py

@@ -1,7 +1,7 @@
 import collections
 
-from mock import patch
 import pytest
+from mock import patch
 
 from honcho.export.runit import Export
 
@@ -12,7 +12,7 @@
 
 class TestExportRunit(object):
     @pytest.fixture(autouse=True)
-    def exporter(self, request):  # noqa
+    def exporter(self, request):
         self.export = Export()
 
         get_template_patcher = patch.object(Export, 'get_template')

tests/test_export_supervisord.py

@@ -1,5 +1,4 @@
-from mock import MagicMock
-from mock import patch
+from mock import MagicMock, patch
 
 from honcho.export.supervisord import Export
 

tests/test_export_systemd.py

@@ -1,9 +1,7 @@
 import collections
 
-from mock import MagicMock
-from mock import call
-from mock import patch
 import pytest
+from mock import MagicMock, call, patch
 
 from honcho.export.systemd import Export
 
@@ -17,7 +15,7 @@
 
 class TestExportSystemd(object):
     @pytest.fixture(autouse=True)
-    def exporter(self, request):  # noqa
+    def exporter(self, request):
         self.export = Export()
 
         self.master = MagicMock()

tests/test_export_upstart.py

@@ -1,9 +1,7 @@
 import collections
 
-from mock import MagicMock
-from mock import call
-from mock import patch
 import pytest
+from mock import MagicMock, call, patch
 
 from honcho.export.upstart import Export
 
@@ -17,7 +15,7 @@
 
 class TestExportUpstart(object):
     @pytest.fixture(autouse=True)
-    def exporter(self, request):  # noqa
+    def exporter(self, request):
         self.export = Export()
 
         self.master = MagicMock()

tests/test_invocation.py

@@ -1,8 +1,6 @@
-import sys
-import subprocess
 import re
-
-import pytest
+import subprocess
+import sys
 
 
 def test_runpy_invoke():

tests/test_manager.py

@@ -1,12 +1,11 @@
 import datetime
-import queue
 import multiprocessing
+import queue
 
 import pytest
 
+from honcho.manager import SYSTEM_PRINTER_NAME, Manager
 from honcho.printer import Message
-from honcho.manager import Manager
-from honcho.manager import SYSTEM_PRINTER_NAME
 
 HISTORIES = {
     'one': {
@@ -191,7 +190,7 @@ def find_line(self, data):
 
 class TestManager(object):
     @pytest.fixture(autouse=True)
-    def printer(self):  # noqa
+    def printer(self):
         self.p = FakePrinter()
         self.m = Manager(printer=self.p)
         self.m._clock = FakeClock()

tests/test_printer.py

@@ -1,7 +1,8 @@
 import datetime
+
 import pytest
 
-from honcho.printer import Printer, Message
+from honcho.printer import Message, Printer
 
 
 def fake_message(data, **kwargs):

tests/test_process.py

@@ -1,4 +1,5 @@
 import datetime
+
 import pytest
 
 from honcho.process import Process
@@ -82,7 +83,7 @@ def close(self):
 class TestProcess(object):
 
     @pytest.fixture(autouse=True)
-    def queue(self):  # noqa
+    def queue(self):
         self.q = FakeQueue()
 
     def test_ctor_cmd(self):

tox.ini

@@ -6,10 +6,6 @@
 [tox]
 envlist = py38, py39, py310, py311, py312, py313, pypy39, pypy310, lint
 
-[flake8]
-max-line-length = 110
-exclude = .tox,.git,doc
-
 [pytest]
 minversion = 2.8
 testpaths = tests
@@ -41,16 +37,13 @@ commands = coverage erase
 [testenv:coverage]
 deps = coverage
 skip_install = true
-commands =
-  coverage report
+commands = coverage report
 
 [testenv:lint]
-deps =
-    flake8
-    pep8-naming
+passenv = RUFF_OUTPUT_FORMAT
+deps = ruff
 skip_install = true
-commands =
-    flake8 honcho
+commands = ruff check {posargs}
 
 [testenv:docs]
 extras = docs