Compare commits

..

3 Commits

Author SHA1 Message Date
github-actions
7300104cea Update source translation strings 2026-02-18 05:28:02 +00:00
bctiemann
2900429769 Merge pull request #21441 from netbox-community/21410-tighten-up-ruff-configuration-defaults
Fixes #21410: Expand Ruff exclusions and standardize formatting settings
2026-02-17 13:14:11 -05:00
Martin Hauser
278c82dd88 chore(ruff): Expand configuration for linting and formatting
Update `ruff.toml` with additional exclusions, linting rules, and
formatting preferences. Includes support for respecting `.gitignore`
and a consistent coding style.

Fixes #21410
2026-02-17 18:31:15 +01:00
4 changed files with 49 additions and 37 deletions

View File

@@ -24,13 +24,11 @@ __all__ = (
PLACEHOLDER_HTML = '<span class="text-muted">&mdash;</span>'
IMAGE_DECODING_CHOICES = ('auto', 'async', 'sync')
#
# Attributes
#
class ObjectAttribute:
"""
Base class for representing an attribute of an object.
@@ -195,37 +193,9 @@ class ColorAttr(ObjectAttribute):
class ImageAttr(ObjectAttribute):
"""
An attribute representing an image field on the model. Displays the uploaded image.
Parameters:
load_lazy (bool): If True, the image will be loaded lazily (default: True)
decoding (str): Image decoding option ('async', 'sync', 'auto', None)
"""
template_name = 'ui/attrs/image.html'
def __init__(self, *args, load_lazy=True, decoding=None, **kwargs):
super().__init__(*args, **kwargs)
self.load_lazy = load_lazy
if decoding is not None and decoding not in IMAGE_DECODING_CHOICES:
raise ValueError(
_('Invalid decoding option: {decoding}! Must be one of {image_decoding_choices}').format(
decoding=decoding, image_decoding_choices=', '.join(IMAGE_DECODING_CHOICES)
)
)
# Compute default decoding:
# - lazy images: async decoding (performance-friendly hint)
# - non-lazy images: omit decoding (browser default/auto)
if decoding is None and load_lazy:
decoding = 'async'
self.decoding = decoding
def get_context(self, obj, context):
return {
'decoding': self.decoding,
'load_lazy': self.load_lazy,
}
class RelatedObjectAttr(ObjectAttribute):
"""

View File

@@ -1,3 +1,3 @@
<a href="{{ value.url }}">
<img src="{{ value.url }}" alt="{{ value.name }}" class="img-fluid" {% if load_lazy %}loading="lazy" {% endif %} {% if decoding %}decoding="{{ decoding }}" {% endif %}/>
<img src="{{ value.url }}" alt="{{ value.name }}" class="img-fluid" />
</a>

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-02-17 05:26+0000\n"
"POT-Creation-Date: 2026-02-18 05:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8531,12 +8531,12 @@ msgstr ""
msgid "Show your personal bookmarks"
msgstr ""
#: netbox/extras/events.py:186
#: netbox/extras/events.py:204
#, python-brace-format
msgid "Unknown action type for an event rule: {action_type}"
msgstr ""
#: netbox/extras/events.py:229
#: netbox/extras/events.py:247
#, python-brace-format
msgid "Cannot import events pipeline {name} error: {error}"
msgstr ""

View File

@@ -1,16 +1,58 @@
# Ruff configuration
####################
exclude = [
"netbox/project-static/**"
".eggs",
".git",
".pyenv",
".pytest_cache",
".ruff_cache",
".venv",
".vscode",
"__pypackages__",
"_build",
"build",
"dist",
"netbox/project-static/**",
"node_modules",
"site-packages",
"venv",
]
# Enforce line length and indent-width
line-length = 120
indent-width = 4
# Ignores anything in .gitignore
respect-gitignore = true
# Always generate Python 3.12-compatible code
target-version = "py312"
[lint]
extend-select = ["E1", "E2", "E3", "E501", "W"]
ignore = ["F403", "F405"]
extend-select = [
"E1", # pycodestyle errors: indentation-related (e.g., unexpected/missing indent)
"E2", # pycodestyle errors: whitespace-related (e.g., missing whitespace, extra spaces)
"E3", # pycodestyle errors: blank lines / spacing around definitions
"E501", # pycodestyle: line too long (enforced with `line-length` above)
"W", # pycodestyle warnings (various style warnings, often whitespace/newlines)
]
ignore = [
"F403", # pyflakes: `from ... import *` used; unable to detect undefined names
"F405", # pyflakes: name may be undefined or defined from star imports
"UP032", # pyupgrade: prefer f-strings over `str.format(...)`
]
preview = true
[lint.per-file-ignores]
"template_code.py" = ["E501"]
[format]
# Use single quotes for strings.
quote-style = "single"
# Indent with spaces, rather than tabs.
indent-style = "space"
# Enforce UNIX line ending
line-ending = "lf"