Skip to content

Dev -> master #1588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 31 commits into from
May 30, 2024
Merged

Dev -> master #1588

merged 31 commits into from
May 30, 2024

Conversation

PromoFaux
Copy link
Member

{Please select 'base: dev' as target branch above! (you can delete this line)}

Description

Motivation and Context

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

PromoFaux and others added 30 commits February 26, 2024 22:09
@PromoFaux
Merge pull request #1545 from pi-hole/master
e3f1583 
Sync master back into development
@dependabot
Bump pytest from 8.0.0 to 8.0.2 in /test
02c93b3 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.0.0...8.0.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Merge pull request #1549 from pi-hole/dependabot/pip/test/dev/pytest-…
f073ab3 
…8.0.2

Bump pytest from 8.0.0 to 8.0.2 in /test
@dependabot
Bump black from 24.1.1 to 24.2.0 in /test
23b3a42 
Bumps [black](https://github.com/psf/black) from 24.1.1 to 24.2.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@24.1.1...24.2.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Merge pull request #1542 from pi-hole/dependabot/pip/test/dev/black-2…
2bb820b 
…4.2.0

Bump black from 24.1.1 to 24.2.0 in /test
@dependabot
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test
146dc52 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.0.0 to 10.1.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest-testinfra@10.0.0...10.1.0)

---
updated-dependencies:
- dependency-name: pytest-testinfra
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Merge pull request #1541 from pi-hole/dependabot/pip/test/dev/pytest-…
061251e 
…testinfra-10.1.0

Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test
@dependabot
Bump Chizkiyahu/delete-untagged-ghcr-action from 3 to 4
6c3b1e7 
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action) from 3 to 4.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases)
- [Commits](Chizkiyahu/delete-untagged-ghcr-action@v3...v4)

---
updated-dependencies:
- dependency-name: Chizkiyahu/delete-untagged-ghcr-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
db20909 
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 2.1.0 to 3.0.0.
- [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases)
- [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md)
- [Commits](eps1lon/actions-label-merge-conflict@v2.1.0...v3.0.0)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Bump black from 24.2.0 to 24.4.0 in /test
e5e6a29 
Bumps [black](https://github.com/psf/black) from 24.2.0 to 24.4.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@24.2.0...24.4.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@PromoFaux
Merge pull request #1566 from pi-hole/dependabot/pip/test/dev/black-2…
13a04a7 
…4.4.0

Bump black from 24.2.0 to 24.4.0 in /test
@dependabot
Bump pytest from 8.0.2 to 8.1.1 in /test
2783e38 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.2 to 8.1.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.0.2...8.1.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@PromoFaux
Merge pull request #1554 from pi-hole/dependabot/pip/test/dev/pytest-…
0fd3ae6 
…8.1.1

Bump pytest from 8.0.2 to 8.1.1 in /test
@lemondjeff
Remove obsolete "version" value from example docker-compose.yml in RE…
b033a18 
…ADME.md and from .yml files in

examples since "Compose doesn't use version to select an exact schema to validate the Compose file,
but prefers the most recent schema when it's implemented."

See: https://github.com/compose-spec/compose-spec/blob/master/04-version-and-name.md
Signed-off-by: Jeff Miller <[email protected]>
@PromoFaux
Merge pull request #1563 from lemondjeff/dev
7e5ab40 
Remove obsolete "version" value from example docker-compose.yml
@dependabot
Bump pytest from 8.1.1 to 8.1.2 in /test
0d64bb5 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.1 to 8.1.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.1.1...8.1.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Merge pull request #1571 from pi-hole/dependabot/pip/test/dev/pytest-…
0b0db71 
…8.1.2

Bump pytest from 8.1.1 to 8.1.2 in /test
@dependabot
Bump black from 24.4.0 to 24.4.2 in /test
94cb08a 
Bumps [black](https://github.com/psf/black) from 24.4.0 to 24.4.2.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@24.4.0...24.4.2)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Merge pull request #1572 from pi-hole/dependabot/pip/test/dev/black-2…
4b9a8ca 
…4.4.2

Bump black from 24.4.0 to 24.4.2 in /test
@PromoFaux
Merge pull request #1556 from pi-hole/dependabot/github_actions/dev/C…
007dc80 
…hizkiyahu/delete-untagged-ghcr-action-4

Bump Chizkiyahu/delete-untagged-ghcr-action from 3 to 4
@PromoFaux
Merge pull request #1559 from pi-hole/dependabot/github_actions/dev/e…
a0a2430 
…ps1lon/actions-label-merge-conflict-3.0.0

Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
@dependabot
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
6990b09 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.5.0 to 3.6.1.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](pytest-dev/pytest-xdist@v3.5.0...v3.6.1)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Merge pull request #1574 from pi-hole/dependabot/pip/test/dev/pytest-…
2ad8905 
…xdist-3.6.1

Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
@dependabot
Bump pytest from 8.1.2 to 8.2.0 in /test
51f1261 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.2 to 8.2.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.1.2...8.2.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Merge pull request #1575 from pi-hole/dependabot/pip/test/dev/pytest-…
7253da1 
…8.2.0

Bump pytest from 8.1.2 to 8.2.0 in /test
@dependabot
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
c17f6bf 
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases)
- [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md)
- [Commits](eps1lon/actions-label-merge-conflict@v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Merge pull request #1580 from pi-hole/dependabot/github_actions/dev/e…
8eb20a7 
…ps1lon/actions-label-merge-conflict-3.0.1

Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
@dependabot
Bump pytest from 8.2.0 to 8.2.1 in /test
3a76e32 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.0 to 8.2.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.2.0...8.2.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@yubiuser
Fix codespell
6f0bbb7 
Signed-off-by: Christian König <[email protected]>
@yubiuser
Merge pull request #1582 from pi-hole/dependabot/pip/test/dev/pytest-…
2684349 
…8.2.1

Bump pytest from 8.2.0 to 8.2.1 in /test
@PromoFaux PromoFaux requested a review from yubiuser May 30, 2024 12:06
@PromoFaux PromoFaux enabled auto-merge May 30, 2024 12:07
@PromoFaux PromoFaux merged commit f77e922 into master May 30, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yubiuser yubiuser yubiuser approved these changes

Assignees
No one assigned
Labels
internal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PromoFaux @yubiuser @lemondjeff