Add flake8 and isort to pre-commit (#777)

peymanslh · pre-commit-ci[bot] · web-flow · commit a642568446bb · 2023-02-09T22:01:48.000-08:00
* Add flake8 and isort to pre-commit * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
diff --git a/.flake8 b/.flake8
@@ -0,0 +1 @@
+max-line-length = 88
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,14 @@
 repos:
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+      - id: flake8
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
     hooks:
diff --git a/pipeline/__init__.py b/pipeline/__init__.py
@@ -1,4 +1,4 @@
-from pkg_resources import get_distribution, DistributionNotFound
+from pkg_resources import DistributionNotFound, get_distribution
 
 try:
     __version__ = get_distribution("django-pipeline").version
diff --git a/pipeline/collector.py b/pipeline/collector.py
@@ -1,5 +1,4 @@
 import os
-
 from collections import OrderedDict
 
 import django
diff --git a/pipeline/compilers/__init__.py b/pipeline/compilers/__init__.py
@@ -10,7 +10,7 @@
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompilerError
-from pipeline.utils import to_class, set_std_streams_blocking
+from pipeline.utils import set_std_streams_blocking, to_class
 
 
 class Compiler(object):
diff --git a/pipeline/compilers/coffee.py b/pipeline/compilers/coffee.py
@@ -1,5 +1,5 @@
-from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
+from pipeline.conf import settings
 
 
 class CoffeeScriptCompiler(SubProcessCompiler):
diff --git a/pipeline/compilers/es6.py b/pipeline/compilers/es6.py
@@ -1,5 +1,5 @@
-from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
+from pipeline.conf import settings
 
 
 class ES6Compiler(SubProcessCompiler):
diff --git a/pipeline/compilers/less.py b/pipeline/compilers/less.py
@@ -1,7 +1,7 @@
 from os.path import dirname
 
-from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
+from pipeline.conf import settings
 
 
 class LessCompiler(SubProcessCompiler):
diff --git a/pipeline/compilers/livescript.py b/pipeline/compilers/livescript.py
@@ -1,5 +1,5 @@
-from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
+from pipeline.conf import settings
 
 
 class LiveScriptCompiler(SubProcessCompiler):
diff --git a/pipeline/compilers/sass.py b/pipeline/compilers/sass.py
@@ -1,7 +1,7 @@
 from os.path import dirname
 
-from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
+from pipeline.conf import settings
 
 
 class SASSCompiler(SubProcessCompiler):
diff --git a/pipeline/compilers/stylus.py b/pipeline/compilers/stylus.py
@@ -1,7 +1,7 @@
 from os.path import dirname
 
-from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
+from pipeline.conf import settings
 
 
 class StylusCompiler(SubProcessCompiler):
diff --git a/pipeline/compressors/__init__.py b/pipeline/compressors/__init__.py
@@ -3,15 +3,14 @@
 import posixpath
 import re
 import subprocess
-
 from itertools import takewhile
 
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.utils.encoding import smart_bytes, force_str
+from django.utils.encoding import force_str, smart_bytes
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompressorError
-from pipeline.utils import to_class, relpath, set_std_streams_blocking
+from pipeline.utils import relpath, set_std_streams_blocking, to_class
 
 URL_DETECTOR = r"""url\((['"]?)\s*(.*?)\1\)"""
 URL_REPLACER = r"""url\(__EMBED__(.+?)(\?\d+)?\)"""
diff --git a/pipeline/compressors/closure.py b/pipeline/compressors/closure.py
@@ -1,5 +1,5 @@
-from pipeline.conf import settings
 from pipeline.compressors import SubProcessCompressor
+from pipeline.conf import settings
 
 
 class ClosureCompressor(SubProcessCompressor):
diff --git a/pipeline/compressors/cssmin.py b/pipeline/compressors/cssmin.py
@@ -1,5 +1,5 @@
-from pipeline.conf import settings
 from pipeline.compressors import SubProcessCompressor
+from pipeline.conf import settings
 
 
 class CSSMinCompressor(SubProcessCompressor):
diff --git a/pipeline/compressors/csstidy.py b/pipeline/compressors/csstidy.py
@@ -1,7 +1,7 @@
 from django.core.files import temp as tempfile
 
-from pipeline.conf import settings
 from pipeline.compressors import SubProcessCompressor
+from pipeline.conf import settings
 
 
 class CSSTidyCompressor(SubProcessCompressor):
diff --git a/pipeline/compressors/terser.py b/pipeline/compressors/terser.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from pipeline.conf import settings
 from pipeline.compressors import SubProcessCompressor
+from pipeline.conf import settings
 
 
 class TerserCompressor(SubProcessCompressor):
diff --git a/pipeline/compressors/uglifyjs.py b/pipeline/compressors/uglifyjs.py
@@ -1,5 +1,5 @@
-from pipeline.conf import settings
 from pipeline.compressors import SubProcessCompressor
+from pipeline.conf import settings
 
 
 class UglifyJSCompressor(SubProcessCompressor):
diff --git a/pipeline/compressors/yuglify.py b/pipeline/compressors/yuglify.py
@@ -1,5 +1,5 @@
-from pipeline.conf import settings
 from pipeline.compressors import SubProcessCompressor
+from pipeline.conf import settings
 
 
 class YuglifyCompressor(SubProcessCompressor):
diff --git a/pipeline/compressors/yui.py b/pipeline/compressors/yui.py
@@ -1,5 +1,5 @@
-from pipeline.conf import settings
 from pipeline.compressors import SubProcessCompressor
+from pipeline.conf import settings
 
 
 class YUICompressor(SubProcessCompressor):
diff --git a/pipeline/conf.py b/pipeline/conf.py
@@ -1,12 +1,11 @@
 import os
-from collections.abc import MutableMapping
 import shlex
+from collections.abc import MutableMapping
 
 from django.conf import settings as _settings
 from django.core.signals import setting_changed
 from django.dispatch import receiver
 
-
 DEFAULTS = {
     'PIPELINE_ENABLED': not _settings.DEBUG,
 
diff --git a/pipeline/finders.py b/pipeline/finders.py
@@ -1,10 +1,14 @@
 from itertools import chain
+from os.path import normpath
 
+from django.contrib.staticfiles.finders import \
+    AppDirectoriesFinder as DjangoAppDirectoriesFinder
+from django.contrib.staticfiles.finders import BaseFinder, BaseStorageFinder
+from django.contrib.staticfiles.finders import \
+    FileSystemFinder as DjangoFileSystemFinder
+from django.contrib.staticfiles.finders import find
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.contrib.staticfiles.finders import BaseFinder, BaseStorageFinder, find, \
-    AppDirectoriesFinder as DjangoAppDirectoriesFinder, FileSystemFinder as DjangoFileSystemFinder
 from django.utils._os import safe_join
-from os.path import normpath
 
 from pipeline.conf import settings
 
diff --git a/pipeline/glob.py b/pipeline/glob.py
@@ -1,6 +1,6 @@
+import fnmatch
 import os
 import re
-import fnmatch
 
 from django.contrib.staticfiles.storage import staticfiles_storage
 
diff --git a/pipeline/jinja2/__init__.py b/pipeline/jinja2/__init__.py
@@ -1,11 +1,10 @@
-from jinja2 import nodes, TemplateSyntaxError
-from jinja2.ext import Extension
-
 from django.contrib.staticfiles.storage import staticfiles_storage
+from jinja2 import TemplateSyntaxError, nodes
+from jinja2.ext import Extension
 
 from ..packager import PackageNotFound
-from ..utils import guess_type
 from ..templatetags.pipeline import PipelineMixin
+from ..utils import guess_type
 
 
 class PipelineExtension(PipelineMixin, Extension):
diff --git a/pipeline/manifest.py b/pipeline/manifest.py
@@ -3,11 +3,9 @@
 from django.conf.settings import settings as django_settings
 from django.contrib.staticfiles.finders import get_finders
 from django.contrib.staticfiles.storage import staticfiles_storage
-
-from pipeline.conf import settings
-
 from manifesto import Manifest
 
+from pipeline.conf import settings
 from pipeline.packager import Packager
 
 
diff --git a/pipeline/middleware.py b/pipeline/middleware.py
@@ -1,11 +1,10 @@
 from django.core.exceptions import MiddlewareNotUsed
+from django.utils.deprecation import MiddlewareMixin
 from django.utils.encoding import DjangoUnicodeDecodeError
 from django.utils.html import strip_spaces_between_tags as minify_html
 
 from pipeline.conf import settings
 
-from django.utils.deprecation import MiddlewareMixin
-
 
 class MinifyHTMLMiddleware(MiddlewareMixin):
     def __init__(self, *args, **kwargs):
diff --git a/pipeline/packager.py b/pipeline/packager.py
@@ -1,5 +1,5 @@
+from django.contrib.staticfiles.finders import find, get_finders
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.contrib.staticfiles.finders import get_finders, find
 from django.core.files.base import ContentFile
 from django.utils.encoding import smart_bytes
 
diff --git a/pipeline/signals.py b/pipeline/signals.py
@@ -1,5 +1,4 @@
 from django.dispatch import Signal
 
-
 css_compressed = Signal()
 js_compressed = Signal()
diff --git a/pipeline/storage.py b/pipeline/storage.py
@@ -1,5 +1,4 @@
 import gzip
-
 from io import BytesIO
 
 from django import get_version as django_version
@@ -8,9 +7,10 @@
 
 if _CACHED_STATIC_FILES_STORAGE_AVAILABLE:
     from django.contrib.staticfiles.storage import CachedStaticFilesStorage
-from django.contrib.staticfiles.storage import ManifestStaticFilesStorage, StaticFilesStorage
-from django.contrib.staticfiles.utils import matches_patterns
 
+from django.contrib.staticfiles.storage import (ManifestStaticFilesStorage,
+                                                StaticFilesStorage)
+from django.contrib.staticfiles.utils import matches_patterns
 from django.core.files.base import File
 
 
diff --git a/pipeline/templatetags/pipeline.py b/pipeline/templatetags/pipeline.py
@@ -1,17 +1,16 @@
 import logging
 import subprocess
 
-from django.contrib.staticfiles.storage import staticfiles_storage
-
 from django import template
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.template.base import VariableDoesNotExist
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 
 from ..collector import default_collector
 from ..conf import settings
 from ..exceptions import CompilerError
-from ..packager import Packager, PackageNotFound
+from ..packager import PackageNotFound, Packager
 from ..utils import guess_type
 
 logger = logging.getLogger(__name__)
diff --git a/pipeline/utils.py b/pipeline/utils.py
@@ -6,10 +6,9 @@
 
 import importlib
 import mimetypes
-import posixpath
 import os
+import posixpath
 import sys
-
 from urllib.parse import quote
 
 from django.utils.encoding import smart_str
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import io
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 setup(
     name='django-pipeline',
diff --git a/tests/settings.py b/tests/settings.py
@@ -1,6 +1,6 @@
+import distutils.spawn
 import glob
 import os
-import distutils.spawn
 
 
 def local_path(path):
diff --git a/tests/tests/__init__.py b/tests/tests/__init__.py
@@ -2,18 +2,17 @@
 import os
 import sys
 
-
 if sys.platform.startswith('win'):
     os.environ.setdefault('NUMBER_OF_PROCESSORS', '1')
 
 
 from .test_collector import *
 from .test_compiler import *
 from .test_compressor import *
-from .test_template import *
 from .test_glob import *
 from .test_middleware import *
 from .test_packager import *
 from .test_storage import *
+from .test_template import *
 from .test_utils import *
 from .test_views import *
diff --git a/tests/tests/test_compiler.py b/tests/tests/test_compiler.py
@@ -10,7 +10,6 @@
 from pipeline.compilers import Compiler, CompilerBase, SubProcessCompiler
 from pipeline.exceptions import CompilerError
 from pipeline.utils import to_class
-
 from tests.utils import _, pipeline_settings
 
 
diff --git a/tests/tests/test_compressor.py b/tests/tests/test_compressor.py
@@ -14,11 +14,10 @@
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from pipeline.compressors import (
-    Compressor, TEMPLATE_FUNC, SubProcessCompressor)
-from pipeline.compressors.yuglify import YuglifyCompressor
 from pipeline.collector import default_collector
-
+from pipeline.compressors import (TEMPLATE_FUNC, Compressor,
+                                  SubProcessCompressor)
+from pipeline.compressors.yuglify import YuglifyCompressor
 from tests.utils import _, pipeline_settings
 
 
diff --git a/tests/tests/test_forms.py b/tests/tests/test_forms.py
@@ -3,6 +3,7 @@
 from django.test import TestCase
 
 from pipeline.forms import PipelineFormMedia
+
 from ..utils import pipeline_settings
 
 
diff --git a/tests/tests/test_middleware.py b/tests/tests/test_middleware.py
@@ -2,8 +2,8 @@
 from unittest.mock import patch
 
 from django.core.exceptions import MiddlewareNotUsed
-from django.test import TestCase
 from django.http import HttpRequest, HttpResponse
+from django.test import TestCase
 
 from pipeline.middleware import MinifyHTMLMiddleware
 
diff --git a/tests/tests/test_packager.py b/tests/tests/test_packager.py
@@ -1,8 +1,7 @@
 from django.test import TestCase
 
 from pipeline.collector import default_collector
-from pipeline.packager import Packager, PackageNotFound
-
+from pipeline.packager import PackageNotFound, Packager
 from tests.utils import _
 
 
diff --git a/tests/tests/test_storage.py b/tests/tests/test_storage.py
diff --git a/tests/tests/test_template.py b/tests/tests/test_template.py
diff --git a/tests/urls.py b/tests/urls.py
diff --git a/tests/utils.py b/tests/utils.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from pkg_resources import get_distribution, DistributionNotFound`
	`1`	`+from pkg_resources import DistributionNotFound, get_distribution`
`2`	`2`
`3`	`3`	`try:`
`4`	`4`	`__version__ = get_distribution("django-pipeline").version`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import os`
`2`		`-`
`3`	`2`	`from collections import OrderedDict`
`4`	`3`
`5`	`4`	`import django`