PR#25: FTBFS fix: Avoid creating .orig files in /usr/bin - rpms/python-pip

rpms / python-pip

#25 FTBFS fix: Avoid creating .orig files in /usr/bin

Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.

rpms/ churchyard/python-pip no-backup-if-mismatch into master

Fedora CI: Workaround for fedora-ci/general #31

Miro Hrončok • 5 years ago

85a78b8

FTBFS fix: Avoid creating .orig files in /usr/bin

Miro Hrončok • 5 years ago

038fce3

python-pip.spec

file modified

+1 -1

		`@@ -337,7 +337,7 @@`
		`# this is not worth dealing with because we'll rebuild once more anyway`
		`%if %{without bootstrap}`
		`for PIP in %{buildroot}%{_bindir}/pip*; do`
		`- patch -p1 $PIP < %{SOURCE10}`
		`+ patch -p1 --no-backup-if-mismatch $PIP < %{SOURCE10}`
		`done`
		`%endif`

tests/tests.yml

file modified

+1 -1

		`@@ -48,7 +48,7 @@`
		`run: pipenv --three && pipenv install six`
		`required_packages:`
		`- gcc`
		`- - /usr/bin/virtualenv`
		`+ - virtualenv`
		`- python26`
		`- python27`
		`- python34`

churchyard commented 5 years ago

Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/python-pip-19.0.2-1.fc31.noarch
BUILDSTDERR: error: Installed (but unpackaged) file(s) found:
BUILDSTDERR:    /usr/bin/pip.orig
BUILDSTDERR:    /usr/bin/pip2.7.orig
BUILDSTDERR:    /usr/bin/pip2.orig
BUILDSTDERR:    /usr/bin/pip3.7.orig
BUILDSTDERR:    /usr/bin/pip3.orig
RPM build errors:
BUILDSTDERR:     Installed (but unpackaged) file(s) found:
BUILDSTDERR:    /usr/bin/pip.orig
BUILDSTDERR:    /usr/bin/pip2.7.orig
BUILDSTDERR:    /usr/bin/pip2.orig
BUILDSTDERR:    /usr/bin/pip3.7.orig
BUILDSTDERR:    /usr/bin/pip3.orig
Child return code was: 1

I don't understand why or how this built before and not now, but meh.

cstratak commented 5 years ago

A change in rpm maybe?

churchyard commented 5 years ago

There is a new fuzz offset in the patch, rpm could not possibly make that change.

I believe it was a change in pip/setuptools. it started failing after pip was upgraded. We create wheels with previous pip version.

So wheels created with pip 18 (or an older setuptools version) had different executables than wheels created with pip 19. if needed we can examine them. But I'd rather not investigate this until the patch fails to apply entirely.

Edited 5 years ago by churchyard

churchyard commented 5 years ago

simple koji ci: LookupError: unknown encoding: utf16-le

That only happens on big endian. already reported at https://github.com/pypa/pip/issues/6054

here is another working scratchbuild: https://koji.fedoraproject.org/koji/taskinfo?taskID=33101943

1 new commit added

Fedora CI: Workaround for fedora-ci/general #31

5 years ago

pviktori commented 5 years ago

The change itself looks good to me, +1, please merge.

Don't know if we want to carry the CI workaround. You're probably the best person to decide. If you merge it, consider opening a bug to remove it once https://pagure.io/fedora-ci/general/issue/31 is fixed.

churchyard commented 5 years ago

The workaround isn't particularly nasty so I don't really mind keeping it forever.

Pull-Request has been merged by churchyard

5 years ago