Add CLI #8

mfocko · 2024-02-29T14:12:48Z

specfile needs to be adjusted

Related to #6

FrostyX

Thank you very much for the PR!

fedora_distro_aliases/cli.py

setup.py

FrostyX · 2024-03-03T22:46:58Z

setup.py

+        "console_scripts": [
+            'resolve-fedora-aliases = fedora_distro_aliases.cli:cli'
+        ],
+    },
 )


Can you please update fedora-distro-aliases.spec as well and install the script?

I would expect it to be taken from this 👀 isn't it?

It seems we both have been kinda wrong 😄

The script is automatically installed as you said but it still needs to be mentioned in the %files section:

error: Installed (but unpackaged) file(s) found: /usr/bin/resolve-fedora-aliases RPM build errors: Installed (but unpackaged) file(s) found: /usr/bin/resolve-fedora-aliases

You can try tito build --rpm --test to reproduce this.

I'd expect this:

%files -n python3-fedora-distro-aliases -f %{pyproject_files}

to cover the CLI script too… Python packaging can't be simple and straightforward, can it? smh my head

By the way

error: Failed build dependencies: python3dist(wheel) is needed by fedora-distro-aliases-1.4-1.git.22.ed527ad.fc40.noarch Wrote: /tmp/tito/fedora-distro-aliases-1.4-1.git.22.ed527ad.fc40.buildreqs.nosrc.rpm ERROR: Error running command: rpmbuild --eval '%undefine scl' --define "_topdir /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a" --define "_sourcedir /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/SOURCES" --define "_builddir /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD" --define "_srcrpmdir /tmp/tito" --define "_rpmdir /tmp/tito" --clean -ba /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/SOURCES/fedora-distro-aliases-git-22.ed527ad/fedora-distro-aliases.spec Status code: 11 Command output: ['', 'setting SOURCE_DATE_EPOCH=1724112000', 'Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.zOAhVn', '+ umask 022', '+ cd /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD', '+ cd /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD', '+ rm -rf fedora-distro-aliases-git-22.ed527ad', '+ /usr/lib/rpm/rpmuncompress -x /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/SOURCES/fedora-distro-aliases-git-22.ed527ad.tar.gz', '+ STATUS=0', "+ '[' 0 -ne 0 ']'", '+ cd fedora-distro-aliases-git-22.ed527ad', '+ rm -rf /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD/fedora-distro-aliases-git-22.ed527ad-SPECPARTS', '+ /usr/bin/mkdir -p /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD/fedora-distro-aliases-git-22.ed527ad-SPECPARTS', '+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .', '+ RPM_EC=0', '++ jobs -p', '+ exit 0', 'Executing(%generate_buildrequires): /bin/sh -e /var/tmp/rpm-tmp.1AtIAD', '+ umask 022', '+ cd /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD', '+ cd fedora-distro-aliases-git-22.ed527ad', "+ CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer '", '+ export CFLAGS', "+ CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer '", '+ export CXXFLAGS', "+ FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules '", '+ export FFLAGS', "+ FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules '", '+ export FCFLAGS', '+ VALAFLAGS=-g', '+ export VALAFLAGS', "+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes --cap-lints=warn'", '+ export RUSTFLAGS', "+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 '", '+ export LDFLAGS', '+ LT_SYS_LIBRARY_PATH=/usr/lib64:', '+ export LT_SYS_LIBRARY_PATH', '+ CC=gcc', '+ export CC', '+ CXX=g++', '+ export CXX', '+ echo pyproject-rpm-macros', '+ echo python3-devel', "+ echo 'python3dist(pip) >= 19'", "+ echo 'python3dist(packaging)'", "+ '[' -f pyproject.toml ']'", "+ '[' -f setup.py ']'", "+ echo 'python3dist(setuptools) >= 40.8'", "+ echo 'python3dist(wheel)'", "+ rm -rfv '*.dist-info/'", "+ '[' -f /usr/bin/python3 ']'", '+ mkdir -p /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD/.pyproject-builddir', '+ echo -n', "+ CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer '", "+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 '", '+ TMPDIR=/tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD/.pyproject-builddir', '+ RPM_TOXENV=py312', '+ HOSTNAME=rpmbuild', '+ /usr/bin/python3 -Bs /usr/lib/rpm/redhat/pyproject_buildrequires.py --generate-extras --python3_pkgversion 3 --wheeldir /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD/pyproject-wheeldir --output /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD/fedora-distro-aliases-1.4-1.git.22.ed527ad.fc40.x86_64-pyproject-buildrequires', 'Handling setuptools >= 40.8 from default build backend', 'Requirement satisfied: setuptools >= 40.8', ' (installed: setuptools 69.0.3)', 'Handling wheel from default build backend', 'Requirement not satisfied: wheel', 'Exiting dependency generation pass: build backend', '+ cat /tmp/tito/rpmbuild-fedora-distro-aliases6knwar5a/BUILD/fedora-distro-aliases-1.4-1.git.22.ed527ad.fc40.x86_64-pyproject-buildrequires', "+ rm -rfv '*.dist-info/'", '+ RPM_EC=0', '++ jobs -p', '+ exit 0', 'error: Failed build dependencies:', '\tpython3dist(wheel) is needed by fedora-distro-aliases-1.4-1.git.22.ed527ad.fc40.noarch', 'Wrote: /tmp/tito/fedora-distro-aliases-1.4-1.git.22.ed527ad.fc40.buildreqs.nosrc.rpm'] ERROR: Please run 'dnf builddep fedora-distro-aliases.spec' as root.

dnf builddep does nothing (as it appears to be already installed), what's going on 👀

You changed the %files so that it now produces two packages. Was this intended or an accident?

- /tmp/tito/noarch/python3-fedora-distro-aliases-1.4-1.git.5.67d613a.fc40.noarch.rpm - /tmp/tito/noarch/fedora-distro-aliases-1.4-1.git.5.67d613a.fc40.noarch.rpm

I would do it this way

--- a/fedora-distro-aliases.spec +++ b/fedora-distro-aliases.spec @@ -49,12 +49,11 @@ Summary: %{summary} %{python3} -m pytest -vv -%files -%{_bindir}/resolve-fedora-aliases +%files -n python3-fedora-distro-aliases -f %{pyproject_files} %license LICENSES/GPL-2.0-or-later.txt %doc README.md +%{_bindir}/resolve-fedora-aliases -%files -n python3-fedora-distro-aliases -f %{pyproject_files} %changelog * Tue Aug 20 2024 Jakub Kadlcik <frostyx@email.cz> 1.4-1

to have everything in a single package. But if you prefer separate subpackages, that's okay too. But in that case, dependencies would have to be specified between those subpackages, etc.

I'll apply the suggestion, I thought it needs to be separated because of the arguments passed in the %files that was there before.

Done, if you want to squash the small changes, let me know :)

Done, if you want to squash the small changes, let me know :)

Yes please, everything into one commit. Then I am merging. Thank you very much :-)

xsuchy · 2024-08-01T11:03:47Z

@mfocko this is stalled for long time. Do you want to finish it?

mfocko · 2024-08-02T21:26:04Z

@mfocko this is stalled for long time. Do you want to finish it?

Adding it to TODO list, cause I totally forgot about that

praiskup · 2024-09-12T07:01:56Z

fedora_distro_aliases/cli.py

+    print(" ".join(resolved_aliases))
+
+
+def setup_parser() -> argparse.ArgumentParser:


Nice, this should allow you to generate manual pages for free:
$ argparse-manpage --pyfile fedora_distro_aliases/cli.py --function setup_parser > resolve-fedora-aliases.1

One thing I noticed is that argparse ignores newlines, now that you mention the manpages, it feels like a bit poor decision on their end 🤔

Yes, RawTextHelpFormatter is needed, like recently here.

I'd create the manpage in a follow-up PR, as this has been open for some time already, would that be an issue?

No no, a follow-up PR is fine :-)
Thank you

FrostyX

Thank you very much for the update @mfocko

FrostyX · 2024-09-17T10:24:59Z

setup.py

+        "console_scripts": [
+            'resolve-fedora-aliases = fedora_distro_aliases.cli:cli'
+        ],
+    },
 )


It seems we both have been kinda wrong 😄

The script is automatically installed as you said but it still needs to be mentioned in the %files section:

error: Installed (but unpackaged) file(s) found: /usr/bin/resolve-fedora-aliases RPM build errors: Installed (but unpackaged) file(s) found: /usr/bin/resolve-fedora-aliases

You can try tito build --rpm --test to reproduce this.

FrostyX · 2024-09-17T10:33:28Z

fedora_distro_aliases/cli.py

+
+    resolved_aliases: set[str] = set()
+    for alias in aliases:
+        resolved_aliases.update(getter(x) for x in distro_aliases[alias])


The GETTERS seems redundant to me because you can do something like this here:

new = {getattr(x, output_type) for x in distro_aliases[alias]} resolved_aliases.update(new)

but I don't mind either option.

Related to rpm-software-management#6 Co-authored-by: Jakub Kadlcik <frostyx@email.cz> Signed-off-by: Matej Focko <mfocko@redhat.com>

praiskup · 2024-09-25T04:04:15Z

🎉

mfocko self-assigned this Feb 29, 2024

FrostyX reviewed Mar 3, 2024

View reviewed changes

FrostyX mentioned this pull request Mar 6, 2024

Fallback for when Bodhi API is down #11

Closed

mfocko force-pushed the feat/gh-action branch from ae22324 to ed527ad Compare September 11, 2024 19:00

praiskup reviewed Sep 12, 2024

View reviewed changes

FrostyX reviewed Sep 17, 2024

View reviewed changes

mfocko force-pushed the feat/gh-action branch 3 times, most recently from dc4afd8 to 9635ccc Compare September 24, 2024 12:01

Add CLI

1c622f2

Related to rpm-software-management#6 Co-authored-by: Jakub Kadlcik <frostyx@email.cz> Signed-off-by: Matej Focko <mfocko@redhat.com>

mfocko force-pushed the feat/gh-action branch from 9635ccc to 1c622f2 Compare September 24, 2024 12:03

FrostyX merged commit 00d9694 into rpm-software-management:main Sep 24, 2024

mfocko deleted the feat/gh-action branch September 25, 2024 07:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CLI #8

Add CLI #8

mfocko commented Feb 29, 2024 •

edited

Loading

FrostyX left a comment

FrostyX Mar 3, 2024

mfocko Sep 11, 2024

FrostyX Sep 17, 2024

mfocko Sep 20, 2024

mfocko Sep 20, 2024

FrostyX Sep 24, 2024

mfocko Sep 24, 2024

mfocko Sep 24, 2024

FrostyX Sep 24, 2024

mfocko Sep 24, 2024

xsuchy commented Aug 1, 2024

mfocko commented Aug 2, 2024

praiskup Sep 12, 2024

mfocko Sep 12, 2024

praiskup Sep 17, 2024 •

edited

Loading

mfocko Sep 21, 2024

FrostyX Sep 24, 2024

FrostyX left a comment

FrostyX Sep 17, 2024

FrostyX Sep 17, 2024

praiskup commented Sep 25, 2024

		print(" ".join(resolved_aliases))


		def setup_parser() -> argparse.ArgumentParser:

Add CLI #8

Add CLI #8

Conversation

mfocko commented Feb 29, 2024 • edited Loading

FrostyX left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xsuchy commented Aug 1, 2024

mfocko commented Aug 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

praiskup Sep 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FrostyX left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

praiskup commented Sep 25, 2024

mfocko commented Feb 29, 2024 •

edited

Loading

praiskup Sep 17, 2024 •

edited

Loading