From ba233a0cbad76b4783a03893e7bf4716fbc0f0ec Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 26 Jun 2024 08:24:58 +0200
Subject: Merging upstream version 24.6.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .gitignore | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index aa76e31..4e87107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ __pycache__
 
 # Packages
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -20,7 +19,6 @@ parts/
 pip-wheel-metadata
 sdist/
 var/
-venv/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -37,8 +35,14 @@ pip-log.txt
 # pyenv
 .python-version
 
+# Environments
+.env
+.venv
+env/
+venv/
+
 # Coverage artifacts
-.coverage
+.coverage*
 coverage*.xml
 pip-wheel-metadata
 .test-results/
@@ -54,6 +58,8 @@ src/ansiblelint/_version.py
 test/fixtures/formatting-before/
 # prettier should not edit this due to forcibly extra-long lines
 examples/playbooks/vars/strings.transformed.yml
+# prettier should not edit this due to intentionally spaced nesting
+examples/playbooks/vars/transform_nested_data.yml
 
 # other
 .cache
@@ -66,7 +72,11 @@ src/ansiblelint/_version.py
 test/eco/CODENOTIFY.html
 test/eco
 test/schemas/node_modules
+test/local-content
 .envrc
-collections
+# collections
+# !/collections
 site
 _readthedocs
+*.tmp.*
+coverage.lcov
-- 
cgit v1.2.3