rpms/python-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add missing sleeps to other build macros

Browse Source 
- Fix build_egg macros
- Add %py_build_wheel and %py_install_wheel macros
This commit is contained in:
Orion Poplawski 2016-11-16 16:28:31 -07:00
parent bad56e0efe
commit e7af332922
4 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
macros.python
View File

@ -3,10 +3,17 @@
%py_build() %{expand: %py_build() %{expand:
CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py_shbang_opts}" %{?*} CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py_shbang_opts}" %{?*}
sleep 1
} }
%py_build_egg() %{expand: %py_build_egg() %{expand:
CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} bdist_egg --executable="%{__python2} %{py_shbang_opts}" %{?*} CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
sleep 1
}
%py_build_wheel() %{expand:
CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
sleep 1
} }
%py_install() %{expand: %py_install() %{expand:
@ -18,6 +25,10 @@
easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python_version}.egg %{?*} easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python_version}.egg %{?*}
} }
%py_install_wheel() %{expand:
pip install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot}
}
%python_provide() %{lua: %python_provide() %{lua:
function string.starts(String,Start) function string.starts(String,Start)
return string.sub(String,1,string.len(Start))==Start return string.sub(String,1,string.len(Start))==Start

11
macros.python2
View File

@ -12,7 +12,12 @@
} }
%py2_build_egg() %{expand: %py2_build_egg() %{expand:
CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} bdist_egg --executable="%{__python2} %{py2_shbang_opts}" %{?*} CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
sleep 1
}
%py2_build_wheel() %{expand:
CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
sleep 1 sleep 1
} }
@ -24,3 +29,7 @@
mkdir -p %{buildroot}%{python2_sitelib} mkdir -p %{buildroot}%{python2_sitelib}
easy_install-%{python2_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python2_version}.egg %{?*} easy_install-%{python2_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python2_version}.egg %{?*}
} }
%py2_install_wheel() %{expand:
pip%{python2_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot}
}

10
macros.python3
View File

@ -13,7 +13,12 @@
} }
%py3_build_egg() %{expand: %py3_build_egg() %{expand:
CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} bdist_egg --executable="%{__python3} %{py3_shbang_opts}" %{?*} CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
sleep 1
}
%py3_build_wheel() %{expand:
CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
sleep 1 sleep 1
} }
@ -25,3 +30,6 @@
mkdir -p %{buildroot}%{python3_sitelib} mkdir -p %{buildroot}%{python3_sitelib}
easy_install-%{python3_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*} easy_install-%{python3_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*}
} }
%py3_install_wheel() %{expand:
pip%{python3_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot}

7
python-rpm-macros.spec
View File

@ -1,6 +1,6 @@
Name: python-rpm-macros Name: python-rpm-macros
Version: 3 Version: 3
Release: 12%{?dist} Release: 13%{?dist}
Summary: The unversioned Python RPM macros Summary: The unversioned Python RPM macros
License: MIT License: MIT
@ -69,6 +69,11 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
%changelog %changelog
* Wed Nov 16 2016 Orion Poplawski <orion@cora.nwra.com> 3-13
- Add missing sleeps to other build macros
- Fix build_egg macros
- Add %%py_build_wheel and %%py_install_wheel macros
* Tue Nov 15 2016 Orion Poplawski <orion@cora.nwra.com> 3-12 * Tue Nov 15 2016 Orion Poplawski <orion@cora.nwra.com> 3-12
- Add %%py_build_egg and %%py_install_egg macros - Add %%py_build_egg and %%py_install_egg macros
- Allow multiple args to %%py_build/install macros - Allow multiple args to %%py_build/install macros