Merge pull request #384 from sass/all-repos_autofix_reorder-pre-commit-config

reorder pre-commit config

Author: asottile

.pre-commit-config.yaml

@@ -6,18 +6,30 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: debug-statements
--   repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
-    hooks:
-    -   id: flake8
-        exclude: ^docs/conf.py
--   repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
+    -   id: double-quote-string-fixer
+    -   id: name-tests-test
+    -   id: requirements-txt-fixer
+-   repo: https://github.com/asottile/reorder_python_imports
+    rev: v3.0.1
     hooks:
-    -   id: pyupgrade
+    -   id: reorder-python-imports
         args: [--py36-plus]
 -   repo: https://github.com/asottile/add-trailing-comma
     rev: v2.2.1
     hooks:
     -   id: add-trailing-comma
         args: [--py36-plus]
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v2.31.1
+    hooks:
+    -   id: pyupgrade
+        args: [--py36-plus]
+-   repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: v1.6.0
+    hooks:
+    -   id: autopep8
+-   repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+    -   id: flake8
+        exclude: ^docs/conf.py

docs/conf.py

@@ -13,12 +13,13 @@
 import sys
 import warnings
 
+import sass
+
 # 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
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
 
-import sass
 
 # -- General configuration -----------------------------------------------------
 
@@ -179,23 +180,23 @@
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    # 'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    # 'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    # 'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  (
-      'index', 'libsass.tex', 'libsass Documentation',
-      'Hong Minhee', 'manual',
-  ),
+    (
+        'index', 'libsass.tex', 'libsass Documentation',
+        'Hong Minhee', 'manual',
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -240,11 +241,11 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (
-      'index', 'libsass', 'libsass Documentation',
-      'Hong Minhee', 'libsass', 'One line description of project.',
-      'Miscellaneous',
-  ),
+    (
+        'index', 'libsass', 'libsass Documentation',
+        'Hong Minhee', 'libsass', 'One line description of project.',
+        'Miscellaneous',
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.

pysassc.py

@@ -88,7 +88,6 @@
 .. _SassC: https://github.com/sass/sassc
 
 """
-
 import functools
 import optparse
 import sys

sass.py

@@ -10,7 +10,6 @@
 'a b {\n  color: blue; }\n'
 
 """
-
 import collections.abc
 import inspect
 import os.path
@@ -56,6 +55,7 @@ class CompileError(ValueError):
     """The exception type that is raised by :func:`compile()`.
     It is a subtype of :exc:`exceptions.ValueError`.
     """
+
     def __init__(self, msg):
         super().__init__(to_native_s(msg))
 
@@ -573,7 +573,7 @@ def my_importer(path, prev):
         elif source_comments in ('line_numbers', 'default'):
             deprecation_message = (
                 'you can simply pass True to '
-                "source_comments instead of " +
+                'source_comments instead of ' +
                 repr(source_comments)
             )
             source_comments = True
@@ -789,7 +789,7 @@ def __new__(cls, r, g, b, a):
 
 class SassList(
     collections.namedtuple(
-            'SassList', ('items', 'separator', 'bracketed'),
+        'SassList', ('items', 'separator', 'bracketed'),
     ),
 ):
 

sasstests.py

@@ -5,7 +5,6 @@
 import glob
 import io
 import json
-import os
 import os.path
 import re
 import shutil
@@ -21,7 +20,8 @@
 
 import pysassc
 import sass
-from sassutils.builder import Manifest, build_directory
+from sassutils.builder import build_directory
+from sassutils.builder import Manifest
 from sassutils.wsgi import SassMiddleware
 
 
@@ -424,11 +424,11 @@ def importer_with_srcmap(path):
                     path,
                     'a { color: red; }',
                     json.dumps({
-                        "version": 3,
-                        "sources": [
-                            path + ".db",
+                        'version': 3,
+                        'sources': [
+                            path + '.db',
                         ],
-                        "mappings": ";AAAA,CAAC,CAAC;EAAE,KAAK,EAAE,GAAI,GAAI",
+                        'mappings': ';AAAA,CAAC,CAAC;EAAE,KAAK,EAAE,GAAI,GAAI',
                     }),
                 ),
             )
@@ -448,13 +448,13 @@ def importer(path):
 
         with assert_raises_compile_error(
             RegexMatcher(
-                    r'^Error: \n'
-                    r'       Traceback \(most recent call last\):\n'
-                    r'.+'
-                    r'ValueError: Bad path: hi\n'
-                    r'        on line 1:9 of stdin\n'
-                    r'>> @import "hi";\n'
-                    r'   --------\^\n',
+                r'^Error: \n'
+                r'       Traceback \(most recent call last\):\n'
+                r'.+'
+                r'ValueError: Bad path: hi\n'
+                r'        on line 1:9 of stdin\n'
+                r'>> @import "hi";\n'
+                r'   --------\^\n',
             ),
         ):
             sass.compile(string='@import "hi";', importers=((0, importer),))
@@ -465,14 +465,14 @@ def importer(path):
 
         with assert_raises_compile_error(
             RegexMatcher(
-                    r'^Error: \n'
-                    r'       Traceback \(most recent call last\):\n'
-                    r'.+'
-                    r'ValueError: Expected importer result to be a tuple of '
-                    r'length \(1, 2, 3\) but got 0: \(\)\n'
-                    r'        on line 1:9 of stdin\n'
-                    r'>> @import "hi";\n'
-                    r'   --------\^\n',
+                r'^Error: \n'
+                r'       Traceback \(most recent call last\):\n'
+                r'.+'
+                r'ValueError: Expected importer result to be a tuple of '
+                r'length \(1, 2, 3\) but got 0: \(\)\n'
+                r'        on line 1:9 of stdin\n'
+                r'>> @import "hi";\n'
+                r'   --------\^\n',
             ),
         ):
             sass.compile(string='@import "hi";', importers=((0, importer),))
@@ -483,14 +483,14 @@ def importer(path):
 
         with assert_raises_compile_error(
             RegexMatcher(
-                    r'^Error: \n'
-                    r'       Traceback \(most recent call last\):\n'
-                    r'.+'
-                    r'ValueError: Expected importer result to be a tuple of '
-                    r"length \(1, 2, 3\) but got 4: \('a', 'b', 'c', 'd'\)\n"
-                    r'        on line 1:9 of stdin\n'
-                    r'>> @import "hi";\n'
-                    r'   --------\^\n',
+                r'^Error: \n'
+                r'       Traceback \(most recent call last\):\n'
+                r'.+'
+                r'ValueError: Expected importer result to be a tuple of '
+                r"length \(1, 2, 3\) but got 4: \('a', 'b', 'c', 'd'\)\n"
+                r'        on line 1:9 of stdin\n'
+                r'>> @import "hi";\n'
+                r'   --------\^\n',
             ),
         ):
             sass.compile(string='@import "hi";', importers=((0, importer),))
@@ -1116,7 +1116,7 @@ def test_error(self):
 class SassFunctionTest(unittest.TestCase):
 
     def test_from_lambda(self):
-        lambda_ = lambda abc, d: None  # pragma: no branch  # noqa: E731
+        def lambda_(abc, d): return None  # pragma: no branch  # noqa: E731
         sf = sass.SassFunction.from_lambda('func_name', lambda_)
         assert 'func_name' == sf.name
         assert ('$abc', '$d') == sf.arguments
@@ -1378,14 +1378,14 @@ class CustomFunctionsTest(unittest.TestCase):
     def test_raises(self):
         with assert_raises_compile_error(
             RegexMatcher(
-                    r'^Error: error in C function raises: \n'
-                    r'       Traceback \(most recent call last\):\n'
-                    r'.+'
-                    r'AssertionError: foo\n'
-                    r'        on line 1:14 of stdin, in function `raises`\n'
-                    r'        from line 1:14 of stdin\n'
-                    r'>> a { content: raises\(\); }\n'
-                    r'   -------------\^\n$',
+                r'^Error: error in C function raises: \n'
+                r'       Traceback \(most recent call last\):\n'
+                r'.+'
+                r'AssertionError: foo\n'
+                r'        on line 1:14 of stdin, in function `raises`\n'
+                r'        from line 1:14 of stdin\n'
+                r'>> a { content: raises\(\); }\n'
+                r'   -------------\^\n$',
             ),
         ):
             compile_with_func('a { content: raises(); }')

sassutils/builder.py

@@ -2,7 +2,6 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 """
-
 import collections.abc
 import os.path
 import re

sassutils/distutils.py

@@ -67,18 +67,17 @@
    Added ``--output-style``/``-s`` option to :class:`build_sass` command.
 
 """
+import functools
+import os.path
 
 import distutils.errors
 import distutils.log
 import distutils.util
-import functools
-import os.path
-
 from setuptools import Command
 from setuptools.command.sdist import sdist
 
-from sass import OUTPUT_STYLES
 from .builder import Manifest
+from sass import OUTPUT_STYLES
 
 __all__ = 'build_sass', 'validate_manifests'
 

sassutils/wsgi.py

@@ -2,16 +2,14 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 """
-
 import collections.abc
 import logging
-import os
 import os.path
 
 from pkg_resources import resource_filename
 
-from sass import CompileError
 from .builder import Manifest
+from sass import CompileError
 
 __all__ = 'SassMiddleware',
 

setup.py

@@ -1,16 +1,17 @@
 import ast
 import atexit
-import distutils.cmd
-import distutils.log
-import distutils.sysconfig
 import os.path
 import platform
 import shutil
 import subprocess
 import sys
 import tempfile
 
-from setuptools import Extension, setup
+import distutils.cmd
+import distutils.log
+import distutils.sysconfig
+from setuptools import Extension
+from setuptools import setup
 
 MACOS_FLAG = ['-mmacosx-version-min=10.7']
 FLAGS_POSIX = [