PR#29: Drop --strip-file-prefix option from %pyX_install_wheel macros, it is not needed - rpms/python-rpm-macros

rpms / python-rpm-macros

#29 Drop --strip-file-prefix option from %pyX_install_wheel macros, it is not needed

Merged 4 years ago by pviktori. Opened 4 years ago by churchyard.

rpms/ churchyard/python-rpm-macros no-strip-file-prefix into master

Drop --strip-file-prefix option from %pyX_install_wheel macros, it is not needed

Miro Hrončok • 4 years ago

f09ccd2

macros.python2

file modified

+1 -1

		`@@ -41,5 +41,5 @@`
		`}`

		`%py2_install_wheel() %{expand:\\\`
		`- pip%{python2_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps`
		`+ pip%{python2_version} install -I dist/%{1} --root %{buildroot} --no-deps`
		`}`

macros.python3

file modified

+1 -1

		`@@ -35,5 +35,5 @@`
		`}`

		`%py3_install_wheel() %{expand:\\\`
		`- pip%{python3_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps`
		`+ pip%{python3_version} install -I dist/%{1} --root %{buildroot} --no-deps`
		`}`

python-rpm-macros.spec

file modified

+4 -1

		`@@ -1,6 +1,6 @@`
		`Name: python-rpm-macros`
		`Version: 3`
		`- Release: 47%{?dist}`
		`+ Release: 48%{?dist}`
		`Summary: The unversioned Python RPM macros`

		`# macros: MIT, compileall2.py: PSFv2`
		`@@ -78,6 +78,9 @@`


		`%changelog`
		`+ * Mon Aug 26 2019 Miro Hrončok <mhroncok@redhat.com> - 3-48`
		`+ - Drop --strip-file-prefix option from %%pyX_install_wheel macros, it is not needed`
		`+`
		`* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3-47`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

churchyard commented 4 years ago

A custom pip patch was needed for this option, but the RECORD files are
relative, so no stripping is needed. We will eventually drop the patch.

rebased onto f09ccd2

4 years ago

torsava commented 4 years ago

LGTM. Have you tested it?

churchyard commented 4 years ago

Only for some packages. If you test for some random ones as well, it won't hurt.

churchyard commented 4 years ago

rpm-specs/python-six.spec
101:%py2_install_wheel %{python2_wheelname}
109:%py3_install_wheel %{python3_wheelname}

rpm-specs/pyparsing.spec
103:%py2_install_wheel %{python2_wheelname}
108:%py3_install_wheel %{python3_wheelname}

rpm-specs/python-sphinxcontrib-github-alt.spec
51:%py3_install_wheel sphinxcontrib_github_alt-%{version}-py2.py3-none-any.whl 

rpm-specs/python-entrypoints.spec
66:%py3_install_wheel %python3_wheelname

rpm-specs/python-epel-rpm-macros.spec
76:- Fix %%py3_install_wheel (bug #1395953)

rpm-specs/python-pip.spec
341:%py2_install_wheel %{python_wheelname}
352:%py3_install_wheel %{python_wheelname}

rpm-specs/python-blurb.spec
51:%py3_install_wheel %{pypi_name}-%{uversion}-py3-none-any.whl 

rpm-specs/python-setuptools.spec
175:%py2_install_wheel %{python_wheelname}
197:%py3_install_wheel %{python_wheelname}

rpm-specs/python-packaging.spec
152:%py2_install_wheel %{python2_wheelname}
159:%py3_install_wheel %{python3_wheelname}

rpm-specs/python-jupyter-kernel-test.spec
58:%py3_install_wheel %{srcname_}-%{version}-py3-none-any.whl
105:- Use new py3_install_wheel macro.

rpm-specs/sgmanager.spec
35:%py3_install_wheel sgmanager-2.0.0-py3-none-any.whl

rpm-specs/python-terminado.spec
54:%py3_install_wheel %{srcname}-%{version}-py2.py3-none-any.whl

rpm-specs/python-flit.spec
92:%py3_install_wheel %{python3_wheelname}

rpm-specs/python-rpm-macros.spec
197:- Fix %%py3_install_wheel (bug #1395953)

rpm-specs/python-pip-epel.spec
255:%py3_install_wheel %{python3_wheelname}
272:%py2_install_wheel %{python2_wheelname}

rpm-specs/python-appdirs.spec
63:  %py2_install_wheel %{wheelname}
64:  %py3_install_wheel %{wheelname}

rpm-specs/python-testpath.spec
71:%py3_install_wheel %{pypi_name}-%{version}-py2.py3-none-any.whl

pkopkan commented 4 years ago

LGTM

pviktori commented 4 years ago

python-epel-rpm-macros still has --strip-file-prefix. That is expected, right?

The other components listed above build fine and have relative paths in RECORD. (Except python-pip-epel, which has no RECORD)

I will merge, and build together with the python-pip split.

churchyard commented 4 years ago

python-epel-rpm-macros still has --strip-file-prefix. That is expected, right?

It is expected. I haven't checked if epel's ancient pip version puts relative paths to RECORD. We are also not removing the patch from epel. If somebody wants to do that, I'll gladly introduce that person to the problem.

Metadata Update from @churchyard:
- Request assigned

4 years ago