From 0b5dcff8c66ea7f07b935116c6694eb2f741889a Mon Sep 17 00:00:00 2001 From: Don Penney Date: Mon, 22 Oct 2018 16:51:58 -0400 Subject: [PATCH] Add hooks for python wheel generation This update adds hooks to the spec files for the following packages to generate wheels for the python modules: - cgcs-patch - patch-alarm - requests-toolbelt - tsconfig Change-Id: Ibdae0a338a1af493ac522757b61bbd6df1da941e Story: 2003907 Task: 27529 Signed-off-by: Don Penney --- centos_wheels.inc | 4 ++++ cgcs-patch/centos/cgcs-patch.spec | 13 +++++++++++++ patch-alarm/centos/patch-alarm.spec | 13 +++++++++++++ requests-toolbelt/centos/requests-toolbelt.spec | 13 +++++++++++++ tsconfig/centos/tsconfig.spec | 14 ++++++++++++++ 5 files changed, 57 insertions(+) create mode 100644 centos_wheels.inc diff --git a/centos_wheels.inc b/centos_wheels.inc new file mode 100644 index 00000000..65f7338c --- /dev/null +++ b/centos_wheels.inc @@ -0,0 +1,4 @@ +cgcs-patch-wheels +patch-alarm-wheels +requests-toolbelt-wheels +tsconfig-wheels diff --git a/cgcs-patch/centos/cgcs-patch.spec b/cgcs-patch/centos/cgcs-patch.spec index 7a4672e1..665c169c 100644 --- a/cgcs-patch/centos/cgcs-patch.spec +++ b/cgcs-patch/centos/cgcs-patch.spec @@ -10,6 +10,8 @@ Source0: %{name}-%{version}.tar.gz Source1: LICENSE BuildRequires: python-setuptools +BuildRequires: python2-pip +BuildRequires: python2-wheel BuildRequires: systemd-units BuildRequires: systemd-devel Requires: python-devel @@ -27,6 +29,7 @@ TIS Platform Patching %build %{__python} setup.py build +%py2_build_wheel %install %{__python} setup.py install --root=$RPM_BUILD_ROOT \ @@ -34,6 +37,8 @@ TIS Platform Patching --prefix=/usr \ --install-data=/usr/share \ --single-version-externally-managed +mkdir -p $RPM_BUILD_ROOT/wheels +install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ install -m 755 -d %{buildroot}%{_sbindir} install -m 755 -d %{buildroot}%{_sysconfdir}/bash_completion.d @@ -178,3 +183,11 @@ TIS Platform Patching %{_sysconfdir}/init.d/sw-patch-agent %{_unitdir}/sw-patch-agent.service +%package wheels +Summary: %{name} wheels + +%description wheels +Contains python wheels for %{name} + +%files wheels +/wheels/* diff --git a/patch-alarm/centos/patch-alarm.spec b/patch-alarm/centos/patch-alarm.spec index 1e31d10b..0a29a08d 100644 --- a/patch-alarm/centos/patch-alarm.spec +++ b/patch-alarm/centos/patch-alarm.spec @@ -11,6 +11,8 @@ Source0: %{name}-%{version}.tar.gz %define debug_package %{nil} BuildRequires: python-setuptools +BuildRequires: python2-pip +BuildRequires: python2-wheel Requires: python-devel Requires: /bin/bash @@ -24,6 +26,7 @@ TIS Platform Patching %build %{__python} setup.py build +%py2_build_wheel %install %{__python} setup.py install --root=$RPM_BUILD_ROOT \ @@ -31,6 +34,8 @@ TIS Platform Patching --prefix=/usr \ --install-data=/usr/share \ --single-version-externally-managed +mkdir -p $RPM_BUILD_ROOT/wheels +install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ install -m 755 -d %{buildroot}%{_bindir} install -m 755 -d %{buildroot}%{_sysconfdir}/init.d @@ -53,3 +58,11 @@ rm -rf $RPM_BUILD_ROOT "%{_bindir}/patch-alarm-manager" "%{_sysconfdir}/init.d/patch-alarm-manager" +%package wheels +Summary: %{name} wheels + +%description wheels +Contains python wheels for %{name} + +%files wheels +/wheels/* diff --git a/requests-toolbelt/centos/requests-toolbelt.spec b/requests-toolbelt/centos/requests-toolbelt.spec index bcfd895a..1b59bee8 100644 --- a/requests-toolbelt/centos/requests-toolbelt.spec +++ b/requests-toolbelt/centos/requests-toolbelt.spec @@ -11,6 +11,8 @@ Source0: %{name}-%{version}.tar.gz %define debug_package %{nil} BuildRequires: python-setuptools +BuildRequires: python2-pip +BuildRequires: python2-wheel Requires: python-devel Requires: /bin/bash @@ -24,6 +26,7 @@ A utility belt for advanced users of python-requests %build %{__python} setup.py build +%py2_build_wheel %install %{__python} setup.py install --root=$RPM_BUILD_ROOT \ @@ -31,6 +34,8 @@ A utility belt for advanced users of python-requests --prefix=/usr \ --install-data=/usr/share \ --single-version-externally-managed +mkdir -p $RPM_BUILD_ROOT/wheels +install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ %clean rm -rf $RPM_BUILD_ROOT @@ -41,3 +46,11 @@ rm -rf $RPM_BUILD_ROOT %{pythonroot}/requests_toolbelt %{pythonroot}/requests_toolbelt-*.egg-info +%package wheels +Summary: %{name} wheels + +%description wheels +Contains python wheels for %{name} + +%files wheels +/wheels/* diff --git a/tsconfig/centos/tsconfig.spec b/tsconfig/centos/tsconfig.spec index a3801e79..ba3833b4 100644 --- a/tsconfig/centos/tsconfig.spec +++ b/tsconfig/centos/tsconfig.spec @@ -11,6 +11,8 @@ Source0: %{name}-%{version}.tar.gz %define debug_package %{nil} BuildRequires: python-setuptools +BuildRequires: python2-pip +BuildRequires: python2-wheel %description Titanium Cloud Config Info @@ -24,6 +26,7 @@ Titanium Cloud Config Info %build %{__python} setup.py build +%py2_build_wheel %install %{__python} setup.py install --root=$RPM_BUILD_ROOT \ @@ -31,6 +34,8 @@ Titanium Cloud Config Info --prefix=/usr \ --install-data=/usr/share \ --single-version-externally-managed +mkdir -p $RPM_BUILD_ROOT/wheels +install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ install -d -m 755 %{buildroot}%{local_bindir} install -p -D -m 700 scripts/tsconfig %{buildroot}%{local_bindir}/tsconfig @@ -46,3 +51,12 @@ rm -rf $RPM_BUILD_ROOT %{pythonroot}/%{name}/* %dir %{pythonroot}/%{name}-%{version}.0-py2.7.egg-info %{pythonroot}/%{name}-%{version}.0-py2.7.egg-info/* + +%package wheels +Summary: %{name} wheels + +%description wheels +Contains python wheels for %{name} + +%files wheels +/wheels/*