[Lint] Exclude js and css from EOF fixer

- When running pre-commit on all files it is picking up minified js and css files. Since prettier will format correctly the source files ignore them in end-of-file fixer. - The template files in web docs can be ignored too. - Removed the unneeded `pre-commit-hooks` dependency as pre-commit resolves that itself. - Include files fixed by pre-commit.
deluge-torrent · Oct 5, 2018 · a8a4fb6 · a8a4fb6
1 parent 6cf13d1
commit a8a4fb6
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 16 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,3 +1,7 @@
+exclude: >
+  (?x)^(
+      deluge/ui/web/docs/template/.*|
+  )$
 repos:
   - repo: https://github.com/ambv/black
     rev: 18.9b0
@@ -29,6 +33,7 @@ repos:
         name: Fix Double-quotes
       - id: end-of-file-fixer
         name: Fix End-of-files
+        exclude_types: [javascript, css]
       - id: mixed-line-ending
         name: Fix Line-endings
         args: [--fix=auto]

diff --git a/README.rst b/README.rst
@@ -65,4 +65,4 @@ I can't connect to the daemon from another machine:
 
 .. |docs| image:: https://readthedocs.org/projects/deluge/badge/?version=develop
     :target: https://readthedocs.org/projects/deluge/?badge=develop
-    :alt: Documentation Status
+    :alt: Documentation Status
diff --git a/deluge/plugins/Label/TODO b/deluge/plugins/Label/TODO
@@ -9,7 +9,3 @@
 *no client-side validation (could be solved by a ui.aclient exception-plugin)
 *expand/arrows in sidebar are disabled to save space, fix the space issue or implement an alternative
 *fix and move tracker_host column+status-field to core.
-
-
-
-
diff --git a/docs/source/core/index.rst b/docs/source/core/index.rst
@@ -3,4 +3,4 @@ The Deluge Core
 
 .. toctree::
 
-    DelugeRPC <rpc>
+    DelugeRPC <rpc>
diff --git a/docs/source/core/rpc.rst b/docs/source/core/rpc.rst
@@ -102,4 +102,4 @@ Remote API
 ----------
 
 .. autoclass:: deluge.__rpcapi.RpcApi
-    :members:
+    :members:
diff --git a/docs/source/interfaces/console.rst b/docs/source/interfaces/console.rst
@@ -1,2 +1,2 @@
 Deluge Console UI
-=================
+=================
diff --git a/docs/source/interfaces/gtk.rst b/docs/source/interfaces/gtk.rst
@@ -1,2 +1,2 @@
 Deluge GTK UI
-=============
+=============
diff --git a/docs/source/interfaces/index.rst b/docs/source/interfaces/index.rst
@@ -7,4 +7,4 @@ Interfaces.
 
     Gtk Interface <gtk>
     Web Interface <web>
-    Console Interface <console>
+    Console Interface <console>
diff --git a/docs/source/interfaces/web.rst b/docs/source/interfaces/web.rst
@@ -16,4 +16,4 @@ for information on creating one) you are able to specify which you want to use.
 There are 2 ways to enable SSL encryption in the webserver, 1 is to specify it
 in your configuration (accessible via the Preferences window). The other is to
 add '--ssl' when running the webserver, which will override the configuration
-value and enable SSL. 
+value and enable SSL. 
diff --git a/packaging/osx/deluge.modules b/packaging/osx/deluge.modules
@@ -60,4 +60,3 @@
             module="T/Twisted/Twisted-12.3.0.tar.bz2"/>
     </distutils>
 </moduleset>
-
diff --git a/packaging/osx/make-app b/packaging/osx/make-app
@@ -47,4 +47,3 @@ find $LIBDIR/python/deluge-*.egg -name "*.py" -exec rm -f {} \; # Remove source
 rm -fr $LIBDIR/pygtk/2.0/*demo*
 
 echo "*** Packaging done:`du -hs $APPDIR | cut -f 1`"
-
diff --git a/packaging/win32/DelugeStart Theme/etc/gtk-2.0/gtkrc b/packaging/win32/DelugeStart Theme/etc/gtk-2.0/gtkrc
@@ -22,4 +22,4 @@ style "user-font"
 {
 	font_name="9"
 }
-widget_class "*" style "user-font"
+widget_class "*" style "user-font"
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,7 +6,6 @@ tox
 tox-venv
 detox
 pre-commit
-pre-commit-hooks
 flake8-blind-except
 flake8-builtins
 flake8-commas

diff --git a/setup.py b/setup.py
@@ -549,7 +549,6 @@ def run(self):
     'flake8-mutable',
     'flake8-quotes',
     'pre-commit',
-    'pre-commit-hooks',
     'pytest',
     'detox',
     'tox',