Skip to content
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

Merge development into development-v6 (with merge conflicts resolved) #5570

Merged
merged 77 commits into from
Feb 11, 2024
Merged

Merge development into development-v6 (with merge conflicts resolved) #5570

merged 77 commits into from
Feb 11, 2024

Conversation

PromoFaux
Copy link
Member

@PromoFaux PromoFaux commented Feb 9, 2024 •
edited
Loading

This needs some more eyes on it than just mine - I don't quite trust myself.

yubiuser and others added 30 commits June 1, 2023 15:15
@yubiuser
Do not try to remove stale lables on PRs
b2c73f8 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Use env variable
364537b 
Signed-off-by: Christian König <ckoenig@posteo.de>
@PromoFaux
Add missing env:, tweak conditional
8009123 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux
Drop docker-compose from requirements.txt, it's not used. This was th…
7e24025 
…e only thing preventing us from using pyyaml 6.0.1 which fixes issues we were seeing with tests not running (yaml/pyyaml#702)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux
Update test dependencies (v5) (#5343)
98c7d87
@dependabot
Bump tox from 4.6.4 to 4.7.0 in /test
7747cd2 
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.4 to 4.7.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.6.4...4.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump tox from 4.6.4 to 4.7.0 in /test (#5360)
9fc0126
@dependabot
Bump tox from 4.7.0 to 4.9.0 in /test
272ca8c 
Bumps [tox](https://github.com/tox-dev/tox) from 4.7.0 to 4.9.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.7.0...4.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump tox from 4.7.0 to 4.9.0 in /test (#5365)
996234a
@dependabot
Bump pytest-testinfra from 8.1.0 to 9.0.0 in /test
1c6919c 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 8.1.0 to 9.0.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@8.1.0...9.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump actions/checkout from 3.5.3 to 3.6.0
924f8b8 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3.5.3...v3.6.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump pytest-testinfra from 8.1.0 to 9.0.0 in /test (#5370)
a7ed968
@dependabot
Bump tox from 4.9.0 to 4.10.0 in /test
9b68fa0 
Bumps [tox](https://github.com/tox-dev/tox) from 4.9.0 to 4.10.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.9.0...4.10.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump tox from 4.9.0 to 4.10.0 in /test (#5371)
2878c1b
@yubiuser
Bump actions/checkout from 3.5.3 to 3.6.0 (#5372)
fb831b5
@dependabot
Bump tox from 4.10.0 to 4.11.1 in /test
9084b17 
Bumps [tox](https://github.com/tox-dev/tox) from 4.10.0 to 4.11.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.10.0...4.11.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump tox from 4.10.0 to 4.11.1 in /test (#5379)
ff72650
@yubiuser
Remove user agent when downloading adlists
cdc1c1a 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Ignore ABP style entries in debug log dig test
843f573 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Ignore ABP style entries in debug log dig test (#5381)
f035687
@dependabot
Bump actions/checkout from 3.6.0 to 4.0.0
1f241a3 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3.6.0...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump tox from 4.11.1 to 4.11.3 in /test
047eac6 
Bumps [tox](https://github.com/tox-dev/tox) from 4.11.1 to 4.11.3.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.11.1...4.11.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump pytest from 7.4.0 to 7.4.2 in /test
55f72ac 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.0 to 7.4.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@7.4.0...7.4.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump actions/checkout from 3.6.0 to 4.0.0 (#5387)
3f6e41e
@yubiuser
Bump pytest from 7.4.0 to 7.4.2 in /test (#5390)
c46a06b
@yubiuser
Bump tox from 4.11.1 to 4.11.3 in /test (#5389)
7fbc7d4
@PromoFaux
Do not try to remove stale label on PRs (#5292)
fef2861
@PromoFaux
Sync master back into development (#5391)
d6a018a
@yubiuser
Remove fake user agent when downloading adlists (#5366)
4955c52
@dependabot
Bump actions/checkout from 4.0.0 to 4.1.0
c3d1f36 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
PromoFaux and others added 12 commits January 6, 2024 16:53
@PromoFaux
Pi-hole core v5.17.3 (#5520)
19bfa08
@PromoFaux
Sync master back into development (#5537)
aa4ceb4
@dependabot
Bump tox from 4.11.4 to 4.12.0 in /test
9eb4731 
Bumps [tox](https://github.com/tox-dev/tox) from 4.11.4 to 4.12.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.11.4...4.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump tox from 4.11.4 to 4.12.0 in /test (#5547)
e773d03
@dependabot
Bump tox from 4.12.0 to 4.12.1 in /test
ba2682c 
Bumps [tox](https://github.com/tox-dev/tox) from 4.12.0 to 4.12.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.12.0...4.12.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump tox from 4.12.0 to 4.12.1 in /test (#5555)
37c6b35
@yubiuser
Drop Fedora 36 and add Fedora 39 to the test suite
f8bfd59 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Also remove Fedora 37
7b6f0d1 
Signed-off-by: Christian König <ckoenig@posteo.de>
@PromoFaux
Fedora (#5568)
2009fa8
@dependabot
Bump pytest from 7.4.4 to 8.0.0 in /test
f0878c0 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.4 to 8.0.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@7.4.4...8.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump pytest from 7.4.4 to 8.0.0 in /test (#5566)
3ba6ab5
@PromoFaux
Merge branch 'development' into development-v6-merge-development (res…
f193edd 
…olved conflicts)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux PromoFaux requested a review from a team February 9, 2024 19:24
@github-actions github-actions bot added the PR: Merge Conflict Issue blocking check and merge of code label Feb 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 9, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

Conflicts have been resolved.

@github-actions github-actions bot removed the PR: Merge Conflict Issue blocking check and merge of code label Feb 10, 2024
@yubiuser
Copy link
Member

Do we really need to include all the dependabot commits? We run dependabot on v6 as well, so the dependencies should be up to date already. This causes a lot of noise.
I think the better approach would be to really look which commits need to be ported to v6 and cherry those.

@PromoFaux
Copy link
Member Author

IMO, it's about easy mergability (is that a word? It is now)

If we don't do this we'll have difficulty releasing, I think.

@DL6ER DL6ER force-pushed the development-v6-merge-development branch from 838a450 to d7b60ba Compare February 11, 2024 05:32
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the PR: Merge Conflict Issue blocking check and merge of code label Feb 11, 2024
@PromoFaux PromoFaux force-pushed the development-v6-merge-development branch from d7b60ba to f193edd Compare February 11, 2024 13:31
@DL6ER DL6ER removed the PR: Merge Conflict Issue blocking check and merge of code label Feb 11, 2024
@PromoFaux PromoFaux merged commit bb095bb into development-v6 Feb 11, 2024
14 checks passed
@PromoFaux PromoFaux deleted the development-v6-merge-development branch February 11, 2024 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DL6ER DL6ER DL6ER approved these changes

Assignees
No one assigned
Labels
internal Pi-hole v6.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@PromoFaux @yubiuser @DL6ER @rdwebdesign