Merge pull request #1588 from pi-hole/dev

Dev -> master

Author: PromoFaux

.github/workflows/housekeeping.yml

@@ -18,7 +18,7 @@ jobs:
                     password: ${{ secrets.PAT_TOKEN }}
             -
                 name: Delete all containers from repository without tags
-                uses: Chizkiyahu/delete-untagged-ghcr-action@v3
+                uses: Chizkiyahu/delete-untagged-ghcr-action@v4
                 with:
                     token: ${{ secrets.PAT_TOKEN }}
                     repository_owner: ${{ github.repository_owner }}

.github/workflows/merge-conflict.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if PRs are have merge conflicts
-        uses: eps1lon/actions-label-merge-conflict@v2.1.0
+        uses: eps1lon/actions-label-merge-conflict@v3.0.1
         with:
           dirtyLabel: "Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

README.md

@@ -25,8 +25,6 @@
 [Docker-compose](https://docs.docker.com/compose/install/) example:
 
 ```yaml
-version: "3"
-
 # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
 services:
   pihole:

examples/docker-compose-caddy-proxy.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   # Caddy example derived from Caddy's own example at https://hub.docker.com/_/caddy

examples/docker-compose-nginx-proxy.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 # https://github.com/pi-hole/docker-pi-hole/blob/master/README.md
 
 services:

examples/docker-compose.yml.example

@@ -1,5 +1,3 @@
-version: "3"
-
 # https://github.com/pi-hole/docker-pi-hole/blob/master/README.md
 
 services:

examples/docker-pi-hole.cron

@@ -10,7 +10,7 @@
 # (at your option) any later version.
 #
 # This file is under source-control of the Pi-hole installation and update
-# scripts, any changes made to this file will be overwritten when the softare
+# scripts, any changes made to this file will be overwritten when the software
 # is updated or re-installed. Please make any changes to the appropriate crontab
 # or other cron file snippets.
 

test/Pipfile

@@ -6,10 +6,10 @@ verify_ssl = true
 [dev-packages]
 
 [packages]
-pytest = "==8.0.0"
-pytest-xdist = "==3.5.0"
-pytest-testinfra = "==10.0.0"
-black = "==24.3.0"
+pytest = "==8.2.1"
+pytest-xdist = "==3.6.1"
+pytest-testinfra = "==10.1.0"
+black = "==24.4.2"
 
 [requires]
 python_version = "3"