Merge pull request #126 from Avasam/naming-convention

Naming convention

.flake8

@@ -3,13 +3,12 @@ color=always
 max-line-length=120
 ; Auto generated
 exclude=src/gen/
-; TODO: We want to configure this
-ignore=W503,N801,N802,N803,N806,N815,N816
-per-file-ignores =
-    ; imported but unused
-    ; line too long
-    ; mixed case
-    __init__.pyi:F401,E501,N816
-; TODO: Bring WAY down
+ignores=Y015
+per-file-ignores=
+    ; Quotes
+    __init__.pyi:Q000
+; PyQt methods
+ignore-names=closeEvent,paintEvent,keyPressEvent,mousePressEvent,mouseMoveEvent,mouseReleaseEvent
+; TODO: Bring down to 15, same as SonarLint
 max-complexity=55
-inline-quotes = "
+inline-quotes="

.github/workflows/lint-and-build.yml

@@ -16,6 +16,7 @@ on:
       - master
       - dev
       - dev*
+      - 2.0.0
     paths:
       - '**.py'
       - '**.pyi'

PyInstaller/hooks/hook-cv2.py

@@ -0,0 +1,23 @@
+# ------------------------------------------------------------------
+# Copyright (c) 2020 PyInstaller Development Team.
+#
+# This file is distributed under the terms of the GNU General Public
+# License (version 2.0 or later).
+#
+# The full license is available in LICENSE.GPL.txt, distributed with
+# this software.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# ------------------------------------------------------------------
+# https://github.com/pyinstaller/pyinstaller-hooks-contrib/blob/master/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-cv2.py
+
+from PyInstaller.utils.hooks import collect_dynamic_libs, collect_data_files
+
+hiddenimports = ["numpy"]
+
+# Include any DLLs from site-packages/cv2 (opencv_videoio_ffmpeg*.dll can be found there in the PyPI version)
+binaries = collect_dynamic_libs("cv2")
+
+# https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/110
+# OpenCV loader from 4.5.4.60 requires extra config files and modules
+datas = collect_data_files("cv2", include_py_files=True, includes=["**/*.py"])

pyproject.toml

@@ -36,9 +36,9 @@ reportUnknownMemberType = "none"
 # https://pylint.pycqa.org/en/latest/technical_reference/features.html
 [tool.pylint.REPORTS]
 # Just like default but any error will make drop to 9 or less
-evaluation="10.0 - error - ((float(warning + refactor + convention) / statement) * 10)"
+evaluation = "10.0 - error - ((float(warning + refactor + convention) / statement) * 10)"
 [tool.pylint.MASTER]
-fail-under=9.0
+fail-under = 9.0
 # https://pylint.pycqa.org/en/latest/technical_reference/extensions.html
 load-plugins = [
   "pylint.extensions.emptystring",
@@ -71,18 +71,27 @@ ignore-paths = [
   "^src/gen/.*$",
 ]
 # No need to mention the fixmes
-disable=["fixme"]
+disable = ["fixme"]
 extension-pkg-allow-list = ["PyQt6", "win32ui"]
 
 [tool.pylint.FORMAT]
 max-line-length = 120
 
 [tool.pylint.'MESSAGES CONTROL']
+# Same as SonarLint
+max-complexity = 15
+max-branches = 15
+# https://pylint.pycqa.org/en/latest/user_guide/options.html#naming-styles
+module-naming-style = "any"
+# Can't make private class with PascalCase
+class-rgx = "_?_?[a-zA-Z]+?$"
+good-names = [
+  # PyQt methods
+  "closeEvent", "paintEvent", "keyPressEvent", "mousePressEvent", "mouseMoveEvent", "mouseReleaseEvent",
+  # https://github.com/PyCQA/pylint/issues/2018
+  "x", "y", "a0", "i", "t0", "t1"]
 disable = [
   "missing-docstring",
-  # TODO: We want to configure this
-  # https://pylint.pycqa.org/en/latest/user_guide/options.html#naming-styles
-  "invalid-name",
   # We group imports
   "wrong-import-position",
   # Already taken care of and grayed out. Also conflicts with Pylance reportIncompatibleMethodOverride

res/about.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>aboutAutoSplitWidget</class>
- <widget class="QWidget" name="aboutAutoSplitWidget">
+ <class>AboutAutoSplitWidget</class>
+ <widget class="QWidget" name="AboutAutoSplitWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -34,7 +34,7 @@
    <iconset resource="resources.qrc">
     <normaloff>:/resources/icon.ico</normaloff>:/resources/icon.ico</iconset>
   </property>
-  <widget class="QPushButton" name="okButton">
+  <widget class="QPushButton" name="ok_button">
    <property name="geometry">
     <rect>
      <x>180</x>
@@ -47,7 +47,7 @@
     <string>OK</string>
    </property>
   </widget>
-  <widget class="QLabel" name="createdbyLabel">
+  <widget class="QLabel" name="created_by_label">
    <property name="geometry">
     <rect>
      <x>10</x>
@@ -60,7 +60,7 @@
     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Created by &lt;a href=&quot;https://twitter.com/toufool&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Toufool&lt;/span&gt;&lt;/a&gt; and &lt;a href=&quot;https://twitter.com/faschz&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Faschz&lt;/span&gt;&lt;/a&gt;&lt;br/&gt;Maintained by &lt;a href=&quot;https://twitter.com/Avasam06&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Avasam&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </widget>
-  <widget class="QLabel" name="versionLabel">
+  <widget class="QLabel" name="version_label">
    <property name="geometry">
     <rect>
      <x>10</x>
@@ -73,7 +73,7 @@
     <string>Version: </string>
    </property>
   </widget>
-  <widget class="QLabel" name="donatetextLabel">
+  <widget class="QLabel" name="donate_text_label">
    <property name="geometry">
     <rect>
      <x>30</x>
@@ -90,7 +90,7 @@ consider donating. Thank you!</string>
     <set>Qt::AlignCenter</set>
    </property>
   </widget>
-  <widget class="QLabel" name="donatebuttonLabel">
+  <widget class="QLabel" name="donate_button_label">
    <property name="geometry">
     <rect>
      <x>60</x>
@@ -109,7 +109,7 @@ consider donating. Thank you!</string>
     <set>Qt::AlignCenter</set>
    </property>
   </widget>
-  <widget class="QLabel" name="iconLabel">
+  <widget class="QLabel" name="icon_label">
    <property name="geometry">
     <rect>
      <x>190</x>
@@ -131,9 +131,9 @@ consider donating. Thank you!</string>
  </resources>
  <connections>
   <connection>
-   <sender>okButton</sender>
+   <sender>ok_button</sender>
    <signal>clicked()</signal>
-   <receiver>aboutAutoSplitWidget</receiver>
+   <receiver>AboutAutoSplitWidget</receiver>
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">