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

Development v6 #5100

Draft
wants to merge 342 commits into
base: development
Choose a base branch
from
Draft

Development v6 #5100

wants to merge 342 commits into from

Conversation

PromoFaux
Copy link
Member

Thought I'd pick up on this again. Ongoing WIP - needs a lot done

@PromoFaux PromoFaux force-pushed the development-v6 branch 2 times, most recently from afad32b to efc06aa Compare January 13, 2023 21:25
@github-actions github-actions bot added the PR: Merge Conflict Issue blocking check and merge of code label Jan 14, 2023
@github-actions
Copy link

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

@github-actions github-actions bot removed the PR: Merge Conflict Issue blocking check and merge of code label Jan 14, 2023
@github-actions
Copy link

Conflicts have been resolved.

@PromoFaux PromoFaux force-pushed the development-v6 branch 8 times, most recently from 0b86276 to cfbf263 Compare January 15, 2023 13:44
@PromoFaux PromoFaux marked this pull request as ready for review January 15, 2023 13:58
@PromoFaux PromoFaux added the WIP Work in progress. label Jan 15, 2023
@PromoFaux PromoFaux force-pushed the development-v6 branch 3 times, most recently from 43cc4d8 to 8bb36aa Compare January 15, 2023 14:11
@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 Jan 16, 2023
@github-actions github-actions bot removed the PR: Merge Conflict Issue blocking check and merge of code label Jan 16, 2023
@github-actions
Copy link

Conflicts have been resolved.

@github-actions github-actions bot added the PR: Merge Conflict Issue blocking check and merge of code label Jan 16, 2023
@github-actions
Copy link

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

@github-actions github-actions bot removed the PR: Merge Conflict Issue blocking check and merge of code label Jan 16, 2023
@github-actions
Copy link

Conflicts have been resolved.

PromoFaux and others added 16 commits April 1, 2024 14:16
@PromoFaux
Bump actions/checkout from 4.1.1 to 4.1.2 (#5606)
48a4693
@dependabot
Bump actions/setup-python from 5.0.0 to 5.1.0
f01362c 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v5.0.0...v5.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@PromoFaux
Bump actions/setup-python from 5.0.0 to 5.1.0 (#5624)
5391513
@PromoFaux
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 (#5625)
32ab5aa
@dependabot @PromoFaux
Bump actions/checkout from 4.1.2 to 4.1.3
5d77c2b 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.1.2...v4.1.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump actions/checkout from 4.1.3 to 4.1.4
91d95e2 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.1.3...v4.1.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump tox from 4.14.2 to 4.15.0 in /test
09ce000 
Bumps [tox](https://github.com/tox-dev/tox) from 4.14.2 to 4.15.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.14.2...4.15.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 actions/checkout from 4.1.3 to 4.1.4 (#5637)
2955737
@yubiuser
Bump tox from 4.14.2 to 4.15.0 in /test (#5638)
4474268
@dependabot
Bump pytest from 8.1.1 to 8.1.2 in /test
78c755b 
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] <support@github.com>
@yubiuser
Bump pytest from 8.1.1 to 8.1.2 in /test (#5639)
448b1f4
@dependabot
Bump pytest from 8.1.2 to 8.2.0 in /test
bf0c3c0 
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] <support@github.com>
@yubiuser
Bump pytest from 8.1.2 to 8.2.0 in /test (#5645)
7ec20d8
@dependabot
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
24ade13 
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] <support@github.com>
@yubiuser
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test (#5646)
6ce747c
@PromoFaux
Merge development into development-v6
200a82a
@github-actions GitHub Actions
Copy link

github-actions bot commented May 8, 2024

Conflicts have been resolved.

@github-actions github-actions bot removed the PR: Merge Conflict Issue blocking check and merge of code label May 8, 2024
yubiuser and others added 5 commits May 11, 2024 15:57
@yubiuser @PromoFaux
Add Ubuntu 24.04 and Fedora 40, remove Fedora 38
cd30772 
Signed-off-by: Christian König <ckoenig@posteo.de>
@dependabot
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
f4c9278 
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] <support@github.com>
@dependabot
Bump actions/checkout from 4.1.4 to 4.1.5
3ad90c1 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.1.4...v4.1.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 (#5653)
8141fdd
@yubiuser
Bump actions/checkout from 4.1.4 to 4.1.5 (#5654)
8886232
@github-actions github-actions bot added the PR: Merge Conflict Issue blocking check and merge of code label May 11, 2024
@github-actions GitHub Actions
Copy link

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

DL6ER and others added 5 commits May 12, 2024 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DL6ER DL6ER DL6ER left review comments

@yubiuser yubiuser yubiuser left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
PR: Merge Conflict Issue blocking check and merge of code WIP Work in progress.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@PromoFaux @yubiuser @DL6ER @pralor-bot @rdwebdesign