Add ruff to linting job

Author: dflook

.config/ruff.toml

@@ -0,0 +1,42 @@
+# Python 2.7 and 3.3+ compatibility requirements (using py37 as minimum ruff supports)
+target-version = "py37"
+
+# Define Python 2.7 builtins that don't exist in Python 3
+builtins = ["unicode"]
+
+line-length = 200
+
+[lint]
+# Enable most rules
+select = [
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # Pyflakes
+    "I",  # isort
+]
+
+ignore = [
+    "I001",  # Import block unsorted
+    "W292",  # No newline at end of file
+    "W293",  # Blank line contains whitespace
+]
+
+# Per-file ignores for specific compatibility needs
+[lint.per-file-ignores]
+# AST compatibility module needs star imports for Python version compatibility
+"src/python_minifier/ast_compat.py" = ["F403", "F405"]
+
+# __init__.py files intentionally re-export for public API
+"*/__init__.py" = ["F401"]
+
+# Type comparisons needed for Python 2.7 compatibility in specific files
+"src/python_minifier/ast_compare.py" = ["E721"]
+"src/python_minifier/rename/rename_literals.py" = ["E721"]
+"src/python_minifier/transforms/constant_folding.py" = ["E721"]
+
+# Compatibility imports in utility modules
+"src/python_minifier/rename/util.py" = ["F401"]
+
+[lint.isort]
+force-single-line = false
+known-first-party = ["python_minifier"]

.github/github_sucks

@@ -1,3 +1,4 @@
 
 
 
+

.github/workflows/test.yaml

@@ -89,7 +89,7 @@ jobs:
           show-progress: false
           persist-credentials: false
 
-      - name: Actions workflows
+      - name: Lint Actions workflows
         run: |
           bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
           ./actionlint
@@ -115,7 +115,8 @@ jobs:
           globs: |
             **/README.md
 
-      - name: Lint Dockerfile
-        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf # v3.1.0
+      - name: Lint Python code
+        uses: astral-sh/ruff-action@9828f49eb4cadf267b40eaa330295c412c68c1f9 # v3
         with:
-          dockerfile: ./docker/Dockerfile-*
+          args: --config=.config/ruff.toml check
+          src: src

src/python_minifier/__init__.py

@@ -86,7 +86,8 @@ def minify(
     :param str source: The python module source code
     :param str filename: The original source filename if known
 
-    :param remove_annotations: Configures the removal of type annotations. True removes all annotations, False removes none. RemoveAnnotationsOptions can be used to configure the removal of specific annotations.
+    :param remove_annotations: Configures the removal of type annotations. True removes all annotations, False removes none.
+        RemoveAnnotationsOptions can be used to configure the removal of specific annotations.
     :type remove_annotations: bool or RemoveAnnotationsOptions
     :param bool remove_pass: If Pass statements should be removed where possible
     :param bool remove_literal_statements: If statements consisting of a single literal should be removed, including docstrings

src/python_minifier/ast_compare.py

@@ -77,26 +77,26 @@ def counter():
                     % (type(l_ast), field, len(l_list), type(r_ast), field, len(r_list)),
                 )
 
-            for i, l, r in zip(counter(), l_list, r_list):
-                if isinstance(l, ast.AST) or isinstance(r, ast.AST):
-                    compare_ast(l, r)
-                elif l != r:
+            for i, left, right in zip(counter(), l_list, r_list):
+                if isinstance(left, ast.AST) or isinstance(right, ast.AST):
+                    compare_ast(left, right)
+                elif left != right:
                     raise CompareError(
                         l_ast,
                         r_ast,
                         'Fields do not match! %s.%s[%i]=%r, %s.%s[%i]=%r'
-                        % (type(l_ast), field, i, l, type(r_ast), field, i, r),
+                        % (type(l_ast), field, i, left, type(r_ast), field, i, right),
                     )
 
         else:
-            l = getattr(l_ast, field, None)
-            r = getattr(r_ast, field, None)
+            left_field = getattr(l_ast, field, None)
+            right_field = getattr(r_ast, field, None)
 
-            if isinstance(l, ast.AST) or isinstance(r, ast.AST):
-                compare_ast(l, r)
-            elif l != r:
+            if isinstance(left_field, ast.AST) or isinstance(right_field, ast.AST):
+                compare_ast(left_field, right_field)
+            elif left_field != right_field:
                 raise CompareError(
                     l_ast,
                     r_ast,
-                    'Fields do not match! %s.%s=%r, %s.%s=%r' % (type(l_ast), field, l, type(r_ast), field, r),
+                    'Fields do not match! %s.%s=%r, %s.%s=%r' % (type(l_ast), field, left_field, type(r_ast), field, right_field),
                 )

src/python_minifier/f_string.py

@@ -272,31 +272,31 @@ def _get_quote(self, c):
         raise ValueError("Couldn't find a quote")
 
     def _literals(self):
-        l = ''
+        literal = ''
         for c in self._s:
             if not self._can_quote(c):
-                if l:
-                    l += self.current_quote
-                    yield l
-                    l = ''
+                if literal:
+                    literal += self.current_quote
+                    yield literal
+                    literal = ''
 
                 self.current_quote = self._get_quote(c)
 
-            if l == '':
-                l += self.current_quote
+            if literal == '':
+                literal += self.current_quote
 
             if c == '\n':
-                l += '\\n'
+                literal += '\\n'
             elif c == '\r':
-                l += '\\r'
+                literal += '\\r'
             elif c == '\\':
-                l += '\\\\'
+                literal += '\\\\'
             else:
-                l += c
+                literal += c
 
-        if l:
-            l += self.current_quote
-            yield l
+        if literal:
+            literal += self.current_quote
+            yield literal
 
     def __str__(self):
         if self._s == '':
@@ -315,10 +315,10 @@ def __str__(self):
         for start_quote in self.allowed_quotes:
             self.current_quote = start_quote
             s = ''
-            for l in self._literals():
-                if s and s[-1] == l[0]:
+            for literal in self._literals():
+                if s and s[-1] == literal[0]:
                     s += ' '
-                s += l
+                s += literal
 
             if eval(s) == self._s:
                 candidates.append(s)
@@ -399,23 +399,23 @@ def _get_quote(self, c):
         raise ValueError("Couldn't find a quote")
 
     def _literals(self):
-        l = ''
+        literal = ''
         for b in self._b:
             if not self._can_quote(b):
-                if l:
-                    l += self.current_quote
-                    yield l
-                    l = ''
+                if literal:
+                    literal += self.current_quote
+                    yield literal
+                    literal = ''
 
                 self.current_quote = self._get_quote(b)
 
-            if l == '':
-                l = 'b' + self.current_quote
-            l += chr(b)
+            if literal == '':
+                literal = 'b' + self.current_quote
+            literal += chr(b)
 
-        if l:
-            l += self.current_quote
-            yield l
+        if literal:
+            literal += self.current_quote
+            yield literal
 
     def __str__(self):
         if self._b == b'':
@@ -434,10 +434,10 @@ def __str__(self):
         for start_quote in self.allowed_quotes:
             self.current_quote = start_quote
             s = ''
-            for l in self._literals():
-                if s and s[-1] == l[0]:
+            for literal in self._literals():
+                if s and s[-1] == literal[0]:
                     s += ' '
-                s += l
+                s += literal
 
             assert eval(s) == self._b
             candidates.append(s)