Merge pull request #9935 from DefectDojo/release/2.33.3

Release: Merge release into master from: release/2.33.3

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.33.2",
+  "version": "2.33.3",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa: F401
 
-__version__ = '2.33.2'
+__version__ = '2.33.3'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://documentation.defectdojo.com'

dojo/templatetags/display_tags.py

@@ -191,9 +191,10 @@ def percentage(fraction, value):
 
 @register.filter
 def format_epss(value):
-    if value is None:
+    try:
+        return f'{value:.2%}'
+    except (ValueError, TypeError):
         return 'N.A.'
-    return f'{value:.2%}'
 
 
 def asvs_calc_level(benchmark_score):

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.33.2"
+appVersion: "2.33.3"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.120
+version: 1.6.121
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap

ruff.toml

@@ -0,0 +1,43 @@
+# Same as Black.
+line-length = 120
+
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".git-rewrite",
+    ".hg",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "venv",
+    #  Not for the dojo specific stuff
+    "dojo/db_migrations"
+]
+
+[lint]
+# Enable the pycodestyle (`E`) and Pyflakes (`F`) rules by default.
+# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
+# McCabe complexity (`C901`) by default.
+select = ["E", "F", "FLY", "TRY004", "TRY2"]
+ignore = ["E501", "E722", "F821"]
+
+# Allow autofix for all enabled rules (when `--fix`) is provided.
+fixable = ["ALL"]
+unfixable = []
+
+preview = true
+
+per-file-ignores = {}