| Message ID | d148df614aef86dd6244dad3e0726750a3176b34.1726793990.git.wqu@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs-progs: libbtrfsutil: fix the CI build failure which requires manual intervention | expand |
在 2024/9/20 10:29, Qu Wenruo 写道: > Currently the libbtrfsutil python binding requires `pypi-README.md` as a > temporary file to act as the longer description. > > But it requires the build to be run twice to generate the temporary > file, preventing CI to properly build the package. > > Fix it by removing the exception raising, after copy_readme(). > > Signed-off-by: Qu Wenruo <wqu@suse.com> Please discard this one. The offending patch shouldn't even be pushed to devel, introducing too much hassles but doesn't even bother to resolve the self-introduced problem. Will send a proper patch for the long description, not building new fixes for such cursed solution. Thanks, Qu > --- > libbtrfsutil/python/setup.py | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/libbtrfsutil/python/setup.py b/libbtrfsutil/python/setup.py > index d4de81dbc1f2..fe9fdf8a52b5 100755 > --- a/libbtrfsutil/python/setup.py > +++ b/libbtrfsutil/python/setup.py > @@ -69,10 +69,8 @@ void add_module_constants(PyObject *m) > > > def read_readme(): > - # FIXME: hackish, needs to be run twice to work > if not os.path.exists('pypi-README.md'): > copy_readme() > - raise Exception("Copied ../README.md to pypi-README.md, run again") > with open('pypi-README.md', 'r') as f: > desc = f.read() > return desc
On Fri, Sep 20, 2024 at 02:04:50PM +0930, Qu Wenruo wrote: > > > 在 2024/9/20 10:29, Qu Wenruo 写道: > > Currently the libbtrfsutil python binding requires `pypi-README.md` as a > > temporary file to act as the longer description. > > > > But it requires the build to be run twice to generate the temporary > > file, preventing CI to properly build the package. > > > > Fix it by removing the exception raising, after copy_readme(). > > > > Signed-off-by: Qu Wenruo <wqu@suse.com> > > Please discard this one. > > The offending patch shouldn't even be pushed to devel, introducing too > much hassles but doesn't even bother to resolve the self-introduced problem. I've removed the patch from devel again, the long description is for pypi.org so not critical right now, the versions can't be resubmitted so next opportunity is 6.11.1. Until then some solution will emerge.
在 2024/9/20 23:58, David Sterba 写道: > On Fri, Sep 20, 2024 at 02:04:50PM +0930, Qu Wenruo wrote: >> >> >> 在 2024/9/20 10:29, Qu Wenruo 写道: >>> Currently the libbtrfsutil python binding requires `pypi-README.md` as a >>> temporary file to act as the longer description. >>> >>> But it requires the build to be run twice to generate the temporary >>> file, preventing CI to properly build the package. >>> >>> Fix it by removing the exception raising, after copy_readme(). >>> >>> Signed-off-by: Qu Wenruo <wqu@suse.com> >> >> Please discard this one. >> >> The offending patch shouldn't even be pushed to devel, introducing too >> much hassles but doesn't even bother to resolve the self-introduced problem. > > I've removed the patch from devel again, the long description is for > pypi.org so not critical right now, the versions can't be resubmitted so > next opportunity is 6.11.1. Until then some solution will emerge. > I'll rebase the newer fix to a standalone patch to do the long description correctly. Thanks, Qu
diff --git a/libbtrfsutil/python/setup.py b/libbtrfsutil/python/setup.py index d4de81dbc1f2..fe9fdf8a52b5 100755 --- a/libbtrfsutil/python/setup.py +++ b/libbtrfsutil/python/setup.py @@ -69,10 +69,8 @@ void add_module_constants(PyObject *m) def read_readme(): - # FIXME: hackish, needs to be run twice to work if not os.path.exists('pypi-README.md'): copy_readme() - raise Exception("Copied ../README.md to pypi-README.md, run again") with open('pypi-README.md', 'r') as f: desc = f.read() return desc
Currently the libbtrfsutil python binding requires `pypi-README.md` as a temporary file to act as the longer description. But it requires the build to be run twice to generate the temporary file, preventing CI to properly build the package. Fix it by removing the exception raising, after copy_readme(). Signed-off-by: Qu Wenruo <wqu@suse.com> --- libbtrfsutil/python/setup.py | 2 -- 1 file changed, 2 deletions(-)