Merge branch 'devel' into switchport_tap_tool

.gitattributes

@@ -1,8 +1,6 @@
 # Collapsing generated schemas from PR diff by default
 /python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml  linguist-generated=true -merge -diff
-/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json  linguist-generated=true -merge -diff
 /python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml  linguist-generated=true -merge -diff
-/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json  linguist-generated=true -merge -diff
 
 # Showing generated tables in PR diff by default by count as generated and automatically use the latest file on merge
 /ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/*  linguist-generated=true -merge diff

.github/.markdownlint.yaml

@@ -91,3 +91,8 @@ MD049:
 MD050:
   # Strong style should be consistent
   style: "asterisk"
+
+# MD037/no-space-in-emphasis - Spaces inside emphasis markers
+# This incorrectly catches stars used in table contents, so *foo | *bar is triggered to remove the space between | and *bar.
+MD037:
+  false

.github/workflows/pull-request-management.yml

@@ -458,7 +458,7 @@ jobs:
         # The version conflicts with our requirements,
         # so we let the galaxy-importer version resolve remaining requirements.
         run: |
-          pip install "galaxy-importer==0.4.20"
+          pip install "galaxy-importer==0.4.25"
       - name: 'Build ansible package'
         run: make collection-build
       - name: 'Run galaxy-importer checks'

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 ci:
-  autoupdate_commit_msg: "Bump: pre-commit autoupdate"
+  autoupdate_commit_msg: "CI: pre-commit autoupdate"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
@@ -75,7 +75,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.5.7
+    rev: v0.6.7
     hooks:
       # Run the linter.
       - id: ruff
@@ -85,7 +85,7 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/pycqa/pylint
-    rev: "v3.2.6"
+    rev: "v3.3.0"
     hooks:
       - id: pylint # Use pylintrc file in repository
         name: Check for Linting errors on Python files outside the Ansible collection.
@@ -137,7 +137,6 @@ repos:
             ansible_collections/arista/avd/changelogs/.*|  # Exclude all files in this directory
             ansible_collections/arista/avd/roles/.*/docs/tables/.*\.md| # Exclude all .md files in tables
             python-avd/pyavd/.*/schema/.*schema\.yml| # Exclude YAML schemas file
-            python-avd/pyavd/.*/schema/.*jsonschema\.json| # Exclude JSON schemas file
             python-avd/pyavd/_cv/api/.*| # Exclude auto generated files for CV API
             python-avd/pyavd/_cv/extra_cv_protos/.*| # Exclude extra CV proto files
             ansible-avd/ansible_collections/arista/avd/docs/plugins/.* | # Excluded auto generated doc for Ansible plugins
@@ -206,12 +205,12 @@ repos:
         additional_dependencies: ['deepmerge>=1.1.0', 'PyYAML>=6.0.0', 'pydantic>=2.3.0', 'jsonschema>=4.10.3', 'referencing>=0.35.0']
 
       - id: templates
-        name: Precompile eos_cli_config_gen Jinja2
+        name: Precompile Jinja2 templates
         entry: sh -c 'python-avd/scripts/compile_templates.py'
         language: python
-        files: python-avd/pyavd/_eos_cli_config_gen/j2templates/
+        files: python-avd/pyavd/(_eos_cli_config_gen|_eos_designs)/j2templates/
         pass_filenames: false
-        additional_dependencies: ['Jinja2>=3.0.0', 'cryptography>=38.0.4', 'deepmerge>=1.1.0', 'jsonschema>=4.10.3']
+        additional_dependencies: ['Jinja2>=3.0.0', 'cryptography>=38.0.4', 'deepmerge>=1.1.0']
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.41.0

Makefile

@@ -83,3 +83,11 @@ unit-tests: ## Run unit test cases using ansible-test. Specify `ANSIBLE_TEST_MOD
 integration-tests: ## Run integration test cases using ansible-test. Specify `ANSIBLE_TEST_MODE=<venv|docker>` (default: `venv`).
 	cd ansible_collections/arista/avd/ ; \
 	ansible-test integration --requirements --$(ANSIBLE_TEST_MODE)
+
+####################
+# Random shortcuts #
+####################
+
+.PHONY: config-diff
+config-diff: ## Run git diff comparing molecule configs with 'devel' using our special config diff ignoring reordering of config lines.
+	@GIT_EXTERNAL_DIFF=development/compare.py git diff devel --ext-diff -- **/configs/*.cfg