Migrate to uv #402

Open
debdolph wants to merge 4 commits from migrate-to-uv into master
debdolph commented 2025-06-08 01:03:58 +02:00 (Migrated from edugit.org)
No description provided.
debdolph commented 2025-06-08 01:26:08 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>8856ccdf - Use new image</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS/-/merge_requests/298/diffs?diff_id=64977&start_sha=abf6eaeb3685e7c215d94d1ddd95179c1f476e22)
debdolph commented 2025-06-08 01:28:19 +02:00 (Migrated from edugit.org)

added 1 commit

  • efaaebe1 - fix ci config

Compare with previous version

added 1 commit <ul><li>efaaebe1 - fix ci config</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS/-/merge_requests/298/diffs?diff_id=64979&start_sha=8856ccdf4b4bfd191016e5227d32138412b96243)
debdolph commented 2025-06-08 01:29:44 +02:00 (Migrated from edugit.org)

added 1 commit

  • f8f33f91 - fix ci config

Compare with previous version

added 1 commit <ul><li>f8f33f91 - fix ci config</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS/-/merge_requests/298/diffs?diff_id=64980&start_sha=efaaebe15a204c6e9d71ec2cb9665ff204852e66)
debdolph commented 2025-06-08 01:34:17 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>374efe9a - fix ci config</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS/-/merge_requests/298/diffs?diff_id=64984&start_sha=f8f33f9176bcc8347866e8dd9cb0cac40831c3a0)
debdolph commented 2025-06-08 02:20:07 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>62b104a2 - update</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS/-/merge_requests/298/diffs?diff_id=64990&start_sha=374efe9aee34639dd4761f51c6c005287bfc3b42)
This pull request has changes conflicting with the target branch.
  • ci/build/dist.yml
  • ci/build/meta.yml
  • ci/general.yml
  • ci/prepare/lock.yml
  • ci/publish/meta.yml
  • ci/publish/pypi.yml
  • template/tox.ini.in
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin migrate-to-uv:migrate-to-uv
git switch migrate-to-uv

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff migrate-to-uv
git switch migrate-to-uv
git rebase master
git switch master
git merge --ff-only migrate-to-uv
git switch migrate-to-uv
git rebase master
git switch master
git merge --no-ff migrate-to-uv
git switch master
git merge --squash migrate-to-uv
git switch master
git merge --ff-only migrate-to-uv
git switch master
git merge migrate-to-uv
git push origin master
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS!402
No description provided.