diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a490c357..6f4f9e48 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,13 +2,13 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer - id: check-yaml - id: check-added-large-files -- repo: https://github.com/psf/black - rev: 25.1.0 +- repo: https://github.com/psf/black-pre-commit-mirror + rev: 26.1.0 hooks: - id: black diff --git a/Render/__init__.py b/Render/__init__.py index 69cd9ed4..01bfed5c 100644 --- a/Render/__init__.py +++ b/Render/__init__.py @@ -25,6 +25,7 @@ It imports all the public symbols which make up the Render Workbench API. """ + import FreeCAD as App App.Console.PrintLog("[Render][Init] Starting Render initialization\n") diff --git a/Render/camera.py b/Render/camera.py index 165f915e..0e150a1c 100644 --- a/Render/camera.py +++ b/Render/camera.py @@ -48,7 +48,6 @@ ) from Render.rdrhandler import RenderingTypes - # Enumeration of allowed values for ViewportMapping parameter (see Coin # documentation) # Nota: Keep following tuple in original order, as relationship between diff --git a/Render/commands.py b/Render/commands.py index eee2109c..9c797f5d 100644 --- a/Render/commands.py +++ b/Render/commands.py @@ -53,7 +53,6 @@ from Render.rendermaterial import is_multimat from Render.subcontainer import start_plugin - # =========================================================================== # Mixins (additional features for commands) # =========================================================================== diff --git a/Render/lights.py b/Render/lights.py index d3a624fc..c0ac082e 100644 --- a/Render/lights.py +++ b/Render/lights.py @@ -25,7 +25,6 @@ Light objects allow to illuminate rendering scenes. """ - # =========================================================================== # Module imports # =========================================================================== @@ -47,7 +46,6 @@ ) from Render.rdrhandler import RenderingTypes - # =========================================================================== # Module functions # =========================================================================== diff --git a/Render/plugins/help/__main__.py b/Render/plugins/help/__main__.py index 8927d894..f660328d 100644 --- a/Render/plugins/help/__main__.py +++ b/Render/plugins/help/__main__.py @@ -41,7 +41,6 @@ from renderplugin import ARGS, RenderPluginApplication - THISDIR = os.path.dirname(__file__) @@ -90,16 +89,13 @@ def __init__(self, starting_url, scripts_dir): css_path = os.path.join(scripts_dir, "waterlight.css") css_url = QUrl.fromLocalFile(css_path).url() - script_run_source = ( - self.SCRIPT_GREASEBLOCK - + f"""\ + script_run_source = self.SCRIPT_GREASEBLOCK + f"""\ $.when( $.ready).then(function() {{ var now_body = $("body").text(); $("body").html( marked.parse(now_body) ); $("head").append(''); }}); - """ - ) # Stylesheet credit: https://github.com/kognise/water.css + """ # Stylesheet credit: https://github.com/kognise/water.css # Insert scripts into Web view scripts = self.view.page().scripts() diff --git a/Render/plugins/materialx/__main__.py b/Render/plugins/materialx/__main__.py index 53e01ee5..35d6b496 100644 --- a/Render/plugins/materialx/__main__.py +++ b/Render/plugins/materialx/__main__.py @@ -68,7 +68,6 @@ PluginMessageEvent, ) - MX_EVENT_TYPE = QEvent.registerEventType() # Remark: please do not use: diff --git a/Render/plugins/materialx/downloader/materialx_downloader.py b/Render/plugins/materialx/downloader/materialx_downloader.py index 6fbe3513..6c421fdc 100644 --- a/Render/plugins/materialx/downloader/materialx_downloader.py +++ b/Render/plugins/materialx/downloader/materialx_downloader.py @@ -45,7 +45,6 @@ SOCKET, ) - # Remark: please do not use: # - QWebEngineProfile.setDownloadPath # - QWebEngineDownloadItem.downloadFileName diff --git a/Render/prefpage.py b/Render/prefpage.py index 58d1f35b..4434c8de 100644 --- a/Render/prefpage.py +++ b/Render/prefpage.py @@ -54,7 +54,6 @@ from Render.rdrhandler import RendererHandler from Render.virtualenv import ensure_rendervenv, remove_virtualenv - # =========================================================================== # Main class # =========================================================================== diff --git a/Render/rdrhandler.py b/Render/rdrhandler.py index 4396b1a3..85ca4e0b 100644 --- a/Render/rdrhandler.py +++ b/Render/rdrhandler.py @@ -36,7 +36,6 @@ input colors in linear colorspace. A conversion is made. """ - # =========================================================================== # Imports # =========================================================================== @@ -57,7 +56,6 @@ from Render import renderables from Render import rendermaterial - # =========================================================================== # Constants # =========================================================================== diff --git a/Render/renderables.py b/Render/renderables.py index 7dfe0550..dea187b4 100644 --- a/Render/renderables.py +++ b/Render/renderables.py @@ -29,7 +29,6 @@ Renderables """ - # =========================================================================== # Imports # =========================================================================== @@ -82,7 +81,6 @@ def isA2pPart(_): from Render.rendermaterial import is_multimat, is_valid_material from Render.rdrexecutor import exec_in_mainthread - # =========================================================================== # Exports # =========================================================================== diff --git a/Render/renderers/Povray.py b/Render/renderers/Povray.py index 1063acba..5588ddc9 100644 --- a/Render/renderers/Povray.py +++ b/Render/renderers/Povray.py @@ -50,7 +50,6 @@ from .utils.misc import fovy_to_fovx - TEMPLATE_FILTER = "Povray templates (povray_*.pov)" mimetypes.init() diff --git a/Render/renderers/utils/sunlight.py b/Render/renderers/utils/sunlight.py index e954ac6c..1968206a 100644 --- a/Render/renderers/utils/sunlight.py +++ b/Render/renderers/utils/sunlight.py @@ -28,13 +28,11 @@ Usage: one may essentially use 'sunlight' function """ - import bisect import numbers from math import exp, cos, pi as PI, radians from collections import namedtuple - # =========================================================================== # Photometric data # =========================================================================== diff --git a/Render/rendermaterial.py b/Render/rendermaterial.py index 7f64e629..ad76a200 100644 --- a/Render/rendermaterial.py +++ b/Render/rendermaterial.py @@ -51,7 +51,6 @@ ) from Render.texture import str2imageid, str2imageid_ext - # =========================================================================== # Standard materials # =========================================================================== diff --git a/Render/rendermesh.py b/Render/rendermesh.py index 7e84db57..e3b774d6 100644 --- a/Render/rendermesh.py +++ b/Render/rendermesh.py @@ -55,7 +55,6 @@ from Render.rendermesh_mp import vector3d from Render.utils import debug - RenderMeshDirs = collections.namedtuple( "RenderMeshDirs", ("project_directory", "export_directory", "relative_path"), diff --git a/Render/rendermesh_mp/autosmooth.py b/Render/rendermesh_mp/autosmooth.py index fea2c9c2..b243353d 100644 --- a/Render/rendermesh_mp/autosmooth.py +++ b/Render/rendermesh_mp/autosmooth.py @@ -38,7 +38,6 @@ from multiprocessing import shared_memory import multiprocessing as mp - try: import numpy as np from numpy import bitwise_or, left_shift diff --git a/Render/rendermesh_mp/uvmap_cube.py b/Render/rendermesh_mp/uvmap_cube.py index e63cf304..cfb38dc9 100644 --- a/Render/rendermesh_mp/uvmap_cube.py +++ b/Render/rendermesh_mp/uvmap_cube.py @@ -45,7 +45,6 @@ barycenter, ) - # Vocabulary: # Point: a 3-tuple of float designing a point in 3D # Facet: a 3-tuple of indices (integer) pointing to 3 points in a point list diff --git a/Render/taskpanels.py b/Render/taskpanels.py index 2d652451..a3ff5fe3 100644 --- a/Render/taskpanels.py +++ b/Render/taskpanels.py @@ -23,7 +23,6 @@ """This module implements GUI task panels for Render workbench.""" - import os import re import configparser diff --git a/Render/texture.py b/Render/texture.py index d823536d..2bffb4d0 100644 --- a/Render/texture.py +++ b/Render/texture.py @@ -36,7 +36,6 @@ from Render.base import FeatureBase, ViewProviderBase, Prop, CtxMenuItem from Render.utils import translate - ImageId = namedtuple("ImageId", "texture image") diff --git a/Render/view.py b/Render/view.py index 2df55e01..263f1a9d 100644 --- a/Render/view.py +++ b/Render/view.py @@ -27,7 +27,6 @@ rendering project. """ - from PySide.QtCore import QT_TRANSLATE_NOOP from Render.constants import FCDVERSION diff --git a/renderplugin/src/renderplugin/plugin_framework.py b/renderplugin/src/renderplugin/plugin_framework.py index 89644ec4..95316f77 100644 --- a/renderplugin/src/renderplugin/plugin_framework.py +++ b/renderplugin/src/renderplugin/plugin_framework.py @@ -25,6 +25,7 @@ A plugin is an applet that can be launched by Render in a separate process, with an access to Render virtual environment. """ + import sys import os import signal @@ -45,7 +46,6 @@ ) from qtpy.QtWidgets import QApplication, QMainWindow, QMessageBox - sys.path.append(os.getcwd())