Drop six in the core code #4644

Open

tkopecek wants to merge 5 commits from tkopecek/koji:issue4642-six-core into master

pull from: tkopecek/koji:issue4642-six-core

merge into: koji:master

koji:master

koji:scheduler-watch

koji:rpmdiff-fixes

koji:koji-1.35-updates

koji:koji-1.33-updates

koji:koji-1.34-updates

koji:koji-1.32-updates

koji:koji-1.31-updates

koji:koji-1.30-updates

koji:koji-1.29-updates

koji:koji-1.28-updates

koji:koji-1.27-updates

koji:koji-1.26-updates

koji:koji-1.25-updates

koji:koji-1.24-updates

koji:koji-1.21-updates

koji:koji-1.22-updates

koji:koji-1.23-updates

koji:koji-1.20-updates

koji:koji-1.19-updates

koji:koji-1.18-updates

koji:koji-1.17-updates

koji:koji-1.16-updates

koji:koji-1.14-updates

koji:koji-1.15-updates

koji:koji-1.11-updates

koji:koji-1.12-updates

koji:koji-1.13-updates

koji:legacy-py24

Conversation 2 Commits 5 Files changed 10 +85 -216

tkopecek commented 2026-08-14 12:26:04 +00:00

Owner

Copy link

Related: #4624

Related: https://forge.fedoraproject.org/koji/koji/issues/4624

tkopecek added 1 commit 2026-08-14 12:26:04 +00:00

Drop six in the core code ... 9f82ba42c0

Related: #4624

tkopecek added 1 commit 2026-08-14 12:27:17 +00:00

Fix flake8 57eafec4f7

tkopecek added 1 commit 2026-08-14 12:31:18 +00:00

Ignore bandit errors ... 43114f4c2b

Previously this was not hit due to not matching six version of xmlrpc.
Already monkey-patched in xmlrpcplus.

tkopecek added 2 commits 2026-08-14 12:44:51 +00:00

Drop unused import d63b05398b

Update API e56aae3c83

tkopecek added 1 commit 2026-08-14 12:53:33 +00:00

Drop koji.PythonImportError.name_from from API test ... 098c730a96

It is not yet in py3.9, failing tests on centos 9

mikem referenced this pull request 2026-08-14 17:01:02 +00:00

better filtering of builtins in check_api #4646

mikem commented 2026-08-17 17:28:14 +00:00

Owner

Copy link

I think I'd rather handle the api test data change with koji/koji!4646. Can we merge that and rebase this?

I think I'd rather handle the api test data change with koji/koji!4646. Can we merge that and rebase this?

tkopecek force-pushed issue4642-six-core from 098c730a96 to 92ed8501f4 2026-08-18 07:15:23 +00:00 Compare

tkopecek commented 2026-08-18 07:20:06 +00:00

Author

Owner

Copy link

Updated, anyway, some API updates are missing: #4648

Updated, anyway, some API updates are missing: https://forge.fedoraproject.org/koji/koji/pulls/4648

tkopecek force-pushed issue4642-six-core from 92ed8501f4 to 7adbb46745 2026-08-19 06:46:08 +00:00 Compare

tkopecek requested review from mikem 2026-09-15 09:27:53 +00:00

tkopecek added this to the 1.37 milestone 2026-10-07 15:36:35 +00:00

All checks were successful

Hide all checks

/ flake8 (pull_request) Successful in 15s

Details

/ bandit (pull_request) Successful in 16s

Details

/ tests (fedora-43@sha256:cf1ef55da0d7dd9251b79263c4d1e2350d4291fcd6dc54a1e751d3fe2cf4614d) (pull_request) Successful in 1m18s

Details

/ tests (centos-10@sha256:1f53b2b040e449b0cfce526f1a221e6dbd6648506270220ea333728a6b52a90b) (pull_request) Successful in 2m5s

Details

/ tests (fedora-44@sha256:5e1187ee4536674e08961cbe6b1b84dfc9df15a513dee328365909be5a0d5ed8) (pull_request) Successful in 1m8s

Details

/ tests (fedora-rawhide@sha256:5e1187ee4536674e08961cbe6b1b84dfc9df15a513dee328365909be5a0d5ed8) (pull_request) Successful in 52s

Details

/ tests (centos-9@sha256:c5fe30a62d4b62b46acdf764bf1f7293e9fa4287972ec6a86ccb43209646dc32) (pull_request) Successful in 2m49s

Details

This pull request can be merged automatically.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u issue4642-six-core:tkopecek-issue4642-six-core

git switch tkopecek-issue4642-six-core

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 tkopecek-issue4642-six-core

git switch tkopecek-issue4642-six-core

git rebase master

git switch master

git merge --ff-only tkopecek-issue4642-six-core

git switch tkopecek-issue4642-six-core

git rebase master

git switch master

git merge --no-ff tkopecek-issue4642-six-core

git switch master

git merge --squash tkopecek-issue4642-six-core

git switch master

git merge --ff-only tkopecek-issue4642-six-core

git switch master

git merge tkopecek-issue4642-six-core

git push origin master

Sign in to join this conversation.

Reviewers

No reviewers

mikem

Labels

Clear labels   

backlog

  

bug

  

Closed As

Dropped

Closed with the reason of Dropped

  

Closed As

Duplicate

Closed with the reason of Duplicate

  

Closed As

Fixed

Closed with the reason of Fixed

  

Closed As

Insufficient data

Closed with the reason of Insufficient data

  

Closed As

Invalid

Closed with the reason of Invalid

  

deprecation

Deprecation warnings and final removals

  

discussion

For issues that need discussion before action

  

doc

docs changes only

  

easyfix

  

feature

  

fedora-infra

Needed by Fedora infra team

  

groomed

  

NEEDINFO

more information needed

  

no_qe

Automated tests are not needed here

  

Priority

High

Priority of High

  

Priority

Low

Priority of Low

  

Priority

Normal

Priority of Normal

  

rhel6-eol

This issue can be implemented after RHEL6 EOL

  

scheduler

  

tech-debt

  

testing-basic

Run current integration tests only

  

testing-custom

Create new integration test

  

testing-done

  

testing-ready

  

usability

primarily affects usability

  

wishful

No labels

backlog

bug

Closed As

Dropped

Closed As

Duplicate

Closed As

Fixed

Closed As

Insufficient data

Closed As

Invalid

deprecation

discussion

doc

easyfix

feature

fedora-infra

groomed

NEEDINFO

no_qe

Priority

High

Priority

Low

Priority

Normal

rhel6-eol

scheduler

tech-debt

testing-basic

testing-custom

testing-done

testing-ready

usability

wishful

Milestone

Clear milestone

No items

No milestone

1.37

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

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

koji/koji!4644

No description provided.