PR#1234: [ELN] Do not include python-maint packages in BaseOS just because they were there in c9s - pungi-fedora

pungi-fedora

#1234 [ELN] Do not include python-maint packages in BaseOS just because they were there in c9s

Merged a year ago by sgallagh. Opened a year ago by churchyard.

churchyard/pungi-fedora eln-nope into eln

Do not include python-maint packages in BaseOS just because they were there in c9s

Miro Hrončok • a year ago

6dd3ebe

prepopulate.json

file modified

+60 -76

		`@@ -4694,6 +4694,9 @@`
		`"python-gssapi": [`
		`"python3-gssapi.aarch64"`
		`],`
		`+ "python-idna": [`
		`+ "python3-idna.noarch"`
		`+ ],`
		`"python-into-dbus-python": [`
		`"python3-into-dbus-python.noarch"`
		`],`
		`@@ -4801,7 +4804,9 @@`
		`"python3-pyrsistent.aarch64"`
		`],`
		`"python-qrcode": [],`
		`- "python-requests": [],`
		`+ "python-requests": [`
		`+ "python3-requests.noarch"`
		`+ ],`
		`"python-requests-file": [`
		`"python3-requests-file.noarch"`
		`],`
		`@@ -4829,9 +4834,18 @@`
		`"python3-rtslib.noarch",`
		`"target-restore.noarch"`
		`],`
		`+ "python-setuptools": [`
		`+ "python3-setuptools.noarch"`
		`+ ],`
		`"python-simpleline": [`
		`"python3-simpleline.noarch"`
		`],`
		`+ "python-six": [`
		`+ "python3-six.noarch"`
		`+ ],`
		`+ "python-urllib3": [`
		`+ "python3-urllib3.noarch"`
		`+ ],`
		`"python-urllib-gssapi": [`
		`"python3-urllib-gssapi.noarch"`
		`],`
		`@@ -10977,6 +10991,9 @@`
		`"python-gssapi": [`
		`"python3-gssapi.ppc64le"`
		`],`
		`+ "python-idna": [`
		`+ "python3-idna.noarch"`
		`+ ],`
		`"python-into-dbus-python": [`
		`"python3-into-dbus-python.noarch"`
		`],`
		`@@ -11084,7 +11101,9 @@`
		`"python3-pyrsistent.ppc64le"`
		`],`
		`"python-qrcode": [],`
		`- "python-requests": [],`
		`+ "python-requests": [`
		`+ "python3-requests.noarch"`
		`+ ],`
		`"python-requests-file": [`
		`"python3-requests-file.noarch"`
		`],`
		`@@ -11112,9 +11131,18 @@`
		`"python3-rtslib.noarch",`
		`"target-restore.noarch"`
		`],`
		`+ "python-setuptools": [`
		`+ "python3-setuptools.noarch"`
		`+ ],`
		`"python-simpleline": [`
		`"python3-simpleline.noarch"`
		`],`
		`+ "python-six": [`
		`+ "python3-six.noarch"`
		`+ ],`
		`+ "python-urllib3": [`
		`+ "python3-urllib3.noarch"`
		`+ ],`
		`"python-urllib-gssapi": [`
		`"python3-urllib-gssapi.noarch"`
		`],`
		`@@ -17154,6 +17182,9 @@`
		`"python-gssapi": [`
		`"python3-gssapi.s390x"`
		`],`
		`+ "python-idna": [`
		`+ "python3-idna.noarch"`
		`+ ],`
		`"python-into-dbus-python": [`
		`"python3-into-dbus-python.noarch"`
		`],`
		`@@ -17261,7 +17292,9 @@`
		`"python3-pyrsistent.s390x"`
		`],`
		`"python-qrcode": [],`
		`- "python-requests": [],`
		`+ "python-requests": [`
		`+ "python3-requests.noarch"`
		`+ ],`
		`"python-requests-file": [`
		`"python3-requests-file.noarch"`
		`],`
		`@@ -17289,9 +17322,18 @@`
		`"python3-rtslib.noarch",`
		`"target-restore.noarch"`
		`],`
		`+ "python-setuptools": [`
		`+ "python3-setuptools.noarch"`
		`+ ],`
		`"python-simpleline": [`
		`"python3-simpleline.noarch"`
		`],`
		`+ "python-six": [`
		`+ "python3-six.noarch"`
		`+ ],`
		`+ "python-urllib3": [`
		`+ "python3-urllib3.noarch"`
		`+ ],`
		`"python-urllib-gssapi": [`
		`"python3-urllib-gssapi.noarch"`
		`],`
		`@@ -23567,6 +23609,9 @@`
		`"python-gssapi": [`
		`"python3-gssapi.x86_64"`
		`],`
		`+ "python-idna": [`
		`+ "python3-idna.noarch"`
		`+ ],`
		`"python-into-dbus-python": [`
		`"python3-into-dbus-python.noarch"`
		`],`
		`@@ -23674,7 +23719,9 @@`
		`"python3-pyrsistent.x86_64"`
		`],`
		`"python-qrcode": [],`
		`- "python-requests": [],`
		`+ "python-requests": [`
		`+ "python3-requests.noarch"`
		`+ ],`
		`"python-requests-file": [`
		`"python3-requests-file.noarch"`
		`],`
		`@@ -23702,9 +23749,18 @@`
		`"python3-rtslib.noarch",`
		`"target-restore.noarch"`
		`],`
		`+ "python-setuptools": [`
		`+ "python3-setuptools.noarch"`
		`+ ],`
		`"python-simpleline": [`
		`"python3-simpleline.noarch"`
		`],`
		`+ "python-six": [`
		`+ "python3-six.noarch"`
		`+ ],`
		`+ "python-urllib3": [`
		`+ "python3-urllib3.noarch"`
		`+ ],`
		`"python-urllib-gssapi": [`
		`"python3-urllib-gssapi.noarch"`
		`],`
		`@@ -26445,9 +26501,6 @@`
		`"python-dns": [`
		`"python3-dns.noarch"`
		`],`
		`- "python-idna": [`
		`- "python3-idna.noarch"`
		`- ],`
		`"python-iniparse": [`
		`"python3-iniparse.noarch"`
		`],`
		`@@ -26467,27 +26520,12 @@`
		`"python-ptyprocess": [`
		`"python3-ptyprocess.noarch"`
		`],`
		`- "python-pysocks": [`
		`- "python3-pysocks.noarch"`
		`- ],`
		`"python-pyudev": [`
		`"python3-pyudev.noarch"`
		`],`
		`- "python-requests": [`
		`- "python3-requests.noarch"`
		`- ],`
		`- "python-setuptools": [`
		`- "python3-setuptools.noarch"`
		`- ],`
		`- "python-six": [`
		`- "python3-six.noarch"`
		`- ],`
		`"python-systemd": [`
		`"python3-systemd.aarch64"`
		`],`
		`- "python-urllib3": [`
		`- "python3-urllib3.noarch"`
		`- ],`
		`"python-urwid": [`
		`"python3-urwid.aarch64"`
		`],`
		`@@ -28021,9 +28059,6 @@`
		`"python-dns": [`
		`"python3-dns.noarch"`
		`],`
		`- "python-idna": [`
		`- "python3-idna.noarch"`
		`- ],`
		`"python-iniparse": [`
		`"python3-iniparse.noarch"`
		`],`
		`@@ -28043,27 +28078,12 @@`
		`"python-ptyprocess": [`
		`"python3-ptyprocess.noarch"`
		`],`
		`- "python-pysocks": [`
		`- "python3-pysocks.noarch"`
		`- ],`
		`"python-pyudev": [`
		`"python3-pyudev.noarch"`
		`],`
		`- "python-requests": [`
		`- "python3-requests.noarch"`
		`- ],`
		`- "python-setuptools": [`
		`- "python3-setuptools.noarch"`
		`- ],`
		`- "python-six": [`
		`- "python3-six.noarch"`
		`- ],`
		`"python-systemd": [`
		`"python3-systemd.ppc64le"`
		`],`
		`- "python-urllib3": [`
		`- "python3-urllib3.noarch"`
		`- ],`
		`"python-urwid": [`
		`"python3-urwid.ppc64le"`
		`],`
		`@@ -29547,9 +29567,6 @@`
		`"python-dns": [`
		`"python3-dns.noarch"`
		`],`
		`- "python-idna": [`
		`- "python3-idna.noarch"`
		`- ],`
		`"python-iniparse": [`
		`"python3-iniparse.noarch"`
		`],`
		`@@ -29569,27 +29586,12 @@`
		`"python-ptyprocess": [`
		`"python3-ptyprocess.noarch"`
		`],`
		`- "python-pysocks": [`
		`- "python3-pysocks.noarch"`
		`- ],`
		`"python-pyudev": [`
		`"python3-pyudev.noarch"`
		`],`
		`- "python-requests": [`
		`- "python3-requests.noarch"`
		`- ],`
		`- "python-setuptools": [`
		`- "python3-setuptools.noarch"`
		`- ],`
		`- "python-six": [`
		`- "python3-six.noarch"`
		`- ],`
		`"python-systemd": [`
		`"python3-systemd.s390x"`
		`],`
		`- "python-urllib3": [`
		`- "python3-urllib3.noarch"`
		`- ],`
		`"python-urwid": [`
		`"python3-urwid.s390x"`
		`],`
		`@@ -31132,9 +31134,6 @@`
		`"python-dns": [`
		`"python3-dns.noarch"`
		`],`
		`- "python-idna": [`
		`- "python3-idna.noarch"`
		`- ],`
		`"python-iniparse": [`
		`"python3-iniparse.noarch"`
		`],`
		`@@ -31154,27 +31153,12 @@`
		`"python-ptyprocess": [`
		`"python3-ptyprocess.noarch"`
		`],`
		`- "python-pysocks": [`
		`- "python3-pysocks.noarch"`
		`- ],`
		`"python-pyudev": [`
		`"python3-pyudev.noarch"`
		`],`
		`- "python-requests": [`
		`- "python3-requests.noarch"`
		`- ],`
		`- "python-setuptools": [`
		`- "python3-setuptools.noarch"`
		`- ],`
		`- "python-six": [`
		`- "python3-six.noarch"`
		`- ],`
		`"python-systemd": [`
		`"python3-systemd.x86_64"`
		`],`
		`- "python-urllib3": [`
		`- "python3-urllib3.noarch"`
		`- ],`
		`"python-urwid": [`
		`"python3-urwid.x86_64"`
		`],`

churchyard commented a year ago

python3-pysocks is no longer in ELN.

The rest is repopulated in AppStream now:

python3-idna
python3-requests
python3-setuptools
python3-six
python3-urllib3

If something pulls it in BaseOS, OK, but don't just put it there right away.

Diff is a bit hard to review, I verified with the following check:

import json
for repo in (prepopulate := json.load(open("prepopulate.json"))):
    for arch in prepopulate[repo]:
        for pkg in ("python-idna", "python-pysocks", "python-requests",
                    "python-setuptools", "python-six", "python-urllib3"):
            if pkg in prepopulate[repo][arch]:
                print(repo, arch, prepopulate[repo][arch][pkg])

Before:

AppStream aarch64 []
AppStream ppc64le []
AppStream s390x []
AppStream x86_64 []
BaseOS aarch64 ['python3-idna.noarch']
BaseOS aarch64 ['python3-pysocks.noarch']
BaseOS aarch64 ['python3-requests.noarch']
BaseOS aarch64 ['python3-setuptools.noarch']
BaseOS aarch64 ['python3-six.noarch']
BaseOS aarch64 ['python3-urllib3.noarch']
BaseOS ppc64le ['python3-idna.noarch']
BaseOS ppc64le ['python3-pysocks.noarch']
BaseOS ppc64le ['python3-requests.noarch']
BaseOS ppc64le ['python3-setuptools.noarch']
BaseOS ppc64le ['python3-six.noarch']
BaseOS ppc64le ['python3-urllib3.noarch']
BaseOS s390x ['python3-idna.noarch']
BaseOS s390x ['python3-pysocks.noarch']
BaseOS s390x ['python3-requests.noarch']
BaseOS s390x ['python3-setuptools.noarch']
BaseOS s390x ['python3-six.noarch']
BaseOS s390x ['python3-urllib3.noarch']
BaseOS x86_64 ['python3-idna.noarch']
BaseOS x86_64 ['python3-pysocks.noarch']
BaseOS x86_64 ['python3-requests.noarch']
BaseOS x86_64 ['python3-setuptools.noarch']
BaseOS x86_64 ['python3-six.noarch']
BaseOS x86_64 ['python3-urllib3.noarch']

After:

AppStream aarch64 ['python3-idna.noarch']
AppStream aarch64 ['python3-requests.noarch']
AppStream aarch64 ['python3-setuptools.noarch']
AppStream aarch64 ['python3-six.noarch']
AppStream aarch64 ['python3-urllib3.noarch']
AppStream ppc64le ['python3-idna.noarch']
AppStream ppc64le ['python3-requests.noarch']
AppStream ppc64le ['python3-setuptools.noarch']
AppStream ppc64le ['python3-six.noarch']
AppStream ppc64le ['python3-urllib3.noarch']
AppStream s390x ['python3-idna.noarch']
AppStream s390x ['python3-requests.noarch']
AppStream s390x ['python3-setuptools.noarch']
AppStream s390x ['python3-six.noarch']
AppStream s390x ['python3-urllib3.noarch']
AppStream x86_64 ['python3-idna.noarch']
AppStream x86_64 ['python3-requests.noarch']
AppStream x86_64 ['python3-setuptools.noarch']
AppStream x86_64 ['python3-six.noarch']
AppStream x86_64 ['python3-urllib3.noarch']