Ruff integration

.devcontainer/devcontainer.json

@@ -26,13 +26,14 @@
   "settings": {
     "python.formatting.provider": "black",
     "python.formatting.blackPath":"/usr/local/bin/black",
-    "python.linting.flake8Enabled": true,
-    "python.linting.enabled": true,
-    "python.linting.flake8Path": "/usr/local/bin/flake8",
     "restructuredtext.confPath": "",
-    "python.linting.mypyEnabled": false,
     "python.analysis.extraPaths": ["/usr/local/lib/python3.10/site-packages"],
     "editor.formatOnSave": true,
+    "ruff.path": ["/usr/local/bin/ruff"],
+    "ruff.args": [
+      "--config",
+      "/app/pyproject.toml"
+    ],
     "[yml]": {
       "editor.defaultFormatter": "esbenp.prettier-vscode",
       "editor.formatOnSave": true
@@ -54,6 +55,7 @@
   "extensions": [
     "ms-python.python",
     "iteratec.bdd-power-tools",
-    "esbenp.prettier-vscode"
+    "esbenp.prettier-vscode",
+    "charliermarsh.ruff"
   ]
 }

CHANGES.txt

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+3.1.1 - 
+------------------
+
+- Use ruff for linting.
+  [ggozad]
+
 3.1.0 - 2022-11-10
 ------------------
 

pyproject.toml

@@ -27,14 +27,50 @@ selenium = "^4"
 
 [tool.poetry.dev-dependencies]
 black = "^21.11b1"
-flake8 = "^4.0.1"
 pdbpp = "^0.10.3"
 
 [tool.poetry.scripts]
 mailmock = "behaving.mail.mock:main"
 smsmock = "behaving.sms.mock:main"
 gcmmock = "behaving.notifications.gcm.mock:main"
 
+[tool.poetry.group.dev.dependencies]
+ruff = "^0.0.117"
+
+[tool.ruff]
+
+line-length = 88
+
+# Enable Flake's "E" and "F" codes by default and "I" for sorting imports.
+select = ["E", "F", "I"]
+ignore = ["E501"]
+
+# Exclude a variety of commonly ignored directories.
+exclude = [
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".mypy_cache",
+    ".nox",
+    ".ruff_cache",
+    ".tox",
+    ".venv",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "venv",
+]
+per-file-ignores = {"__init__.py"=["F401","F403"], "steps.py"=["F401","F403"],"css.py"=["E731"]}
+
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+# Assume Python 3.10.
+target-version = "py310"
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

src/behaving/environment.py

@@ -1,9 +1,8 @@
-from behaving.web import environment as webenv
-from behaving.sms import environment as smsenv
 from behaving.mail import environment as mailenv
 from behaving.notifications.gcm import environment as gcmenv
-
 from behaving.personas import environment as personaenv
+from behaving.sms import environment as smsenv
+from behaving.web import environment as webenv
 
 
 def before_all(context):

src/behaving/mail/mock.py

@@ -1,10 +1,10 @@
+import argparse
+import asyncore
+import logging
 import os
 import smtpd
 import sys
 import time
-import argparse
-import logging
-import asyncore
 
 try:
     from pync import Notifier

src/behaving/mail/steps.py

@@ -1,13 +1,11 @@
 import email
-from email.header import decode_header, make_header
-from email.mime.base import MIMEBase
-from email.header import Header
+import os.path
+import re
 import smtplib
-from email.mime.text import MIMEText
+from email.header import Header, decode_header, make_header
+from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
-import re
-import os.path
-from subprocess import check_output
+from email.mime.text import MIMEText
 
 from behave import step
 from behaving.personas.persona import persona_vars

src/behaving/notifications/gcm/mock.py

@@ -1,10 +1,10 @@
 import argparse
+import json
 import logging
 import os
+import socketserver as SocketServer
 import sys
-import json
 from http.server import SimpleHTTPRequestHandler
-import socketserver as SocketServer
 
 from behaving.mail.mock import getUniqueFilename
 

src/behaving/notifications/gcm/steps.py

@@ -1,13 +1,14 @@
-from behave import step
-from behaving.personas.persona import persona_vars
 import ast
 import json
 
+from behave import step
+from behaving.personas.persona import persona_vars
+
 try:
-    from urllib2 import Request, urlopen, HTTPError
+    from urllib2 import HTTPError, Request, urlopen
 except ImportError:
-    from urllib.request import Request, urlopen
     from urllib.error import HTTPError
+    from urllib.request import Request, urlopen
 
 
 def extract(dict_in, dict_out):

src/behaving/personas/steps.py

@@ -1,7 +1,5 @@
 from behave import step
-
-from behaving.personas.persona import Persona
-from behaving.personas.persona import persona_vars
+from behaving.personas.persona import Persona, persona_vars
 
 
 @step(u'"{name}" as the persona')

src/behaving/sms/mock.py

@@ -5,12 +5,12 @@
 import sys
 
 try:
-    from SimpleHTTPServer import SimpleHTTPRequestHandler
     import SocketServer
+    from SimpleHTTPServer import SimpleHTTPRequestHandler
     from urlparse import parse_qs
 except ImportError:
-    from http.server import SimpleHTTPRequestHandler
     import socketserver as SocketServer
+    from http.server import SimpleHTTPRequestHandler
     from urllib.parse import parse_qs
 
 try:

src/behaving/sms/steps.py

@@ -1,10 +1,11 @@
 try:
     from urllib import urlencode
-    from urllib2 import Request, urlopen, HTTPError  # type: ignore
+
+    from urllib2 import HTTPError, Request, urlopen
 except ImportError:
+    from urllib.error import HTTPError
     from urllib.parse import urlencode
     from urllib.request import Request, urlopen
-    from urllib.error import HTTPError
 
 from behave import step
 from behaving.personas.persona import persona_vars

src/behaving/web/chrome.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from selenium.webdriver import DesiredCapabilities, Chrome
+from selenium.webdriver import Chrome, DesiredCapabilities
 from selenium.webdriver.chrome.options import Options
+from splinter.browser import _DRIVERS
 from splinter.driver.webdriver import BaseWebDriver, WebDriverElement
 from splinter.driver.webdriver.cookie_manager import CookieManager
-from splinter.browser import _DRIVERS
 
 _DOWNLOAD_PATH = "/tmp"
 

src/behaving/web/electron.py

@@ -1,7 +1,7 @@
 from selenium.webdriver import Chrome
+from splinter.browser import _DRIVERS
 from splinter.driver.webdriver import BaseWebDriver, WebDriverElement
 from splinter.driver.webdriver.cookie_manager import CookieManager
-from splinter.browser import _DRIVERS
 
 
 class ElectronWebDriver(BaseWebDriver):