Browse code
Fixed runtime dependencies and make check errors in python pyvim package
Change-Id: Id0ae6ad85dd4c431486f8c02482fc5615a966f02
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3330
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
dthaluru authored on 2017/07/25 03:59:49Showing 1 changed files
| ... | ... |
@@ -4,22 +4,32 @@ |
| 4 | 4 |
Summary: Pure Python Vi Implementation. |
| 5 | 5 |
Name: python-pyvim |
| 6 | 6 |
Version: 0.0.20 |
| 7 |
-Release: 3%{?dist}
|
|
| 7 |
+Release: 4%{?dist}
|
|
| 8 | 8 |
License: UNKNOWN |
| 9 | 9 |
Group: Development/Languages/Python |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Url: https://pypi.python.org/pypi/service_identity |
| 13 | 13 |
Source0: pyvim-%{version}.tar.gz
|
| 14 |
-%define sha1 pyvim=0bcda6d5f01be0b334f8bdf974b23c3f65e023ae |
|
| 14 |
+%define sha1 pyvim-%{version}=0bcda6d5f01be0b334f8bdf974b23c3f65e023ae
|
|
| 15 |
+# To get tests: |
|
| 16 |
+# git clone https://github.com/jonathanslenders/pyvim.git && cd pyvim |
|
| 17 |
+# git checkout 6860c413 && tar -czvf ../pyvim-tests-0.0.20.tar.gz tests/ |
|
| 18 |
+Source1: pyvim-tests-%{version}.tar.gz
|
|
| 19 |
+%define sha1 pyvim-tests=480cec56514ea5ff0387e72c53bbddb951d95954 |
|
| 15 | 20 |
|
| 16 | 21 |
BuildRequires: python2 |
| 17 | 22 |
BuildRequires: python2-libs |
| 18 | 23 |
BuildRequires: python2-devel |
| 19 | 24 |
BuildRequires: python-setuptools |
| 25 |
+%if %{with_check}
|
|
| 26 |
+BuildRequires: python-pytest |
|
| 27 |
+BuildRequires: python-prompt_toolkit |
|
| 28 |
+%endif |
|
| 20 | 29 |
|
| 21 | 30 |
Requires: python2 |
| 22 | 31 |
Requires: python2-libs |
| 32 |
+Requires: python-prompt_toolkit |
|
| 23 | 33 |
|
| 24 | 34 |
BuildArch: noarch |
| 25 | 35 |
|
| ... | ... |
@@ -32,14 +42,20 @@ BuildRequires: python3-devel |
| 32 | 32 |
BuildRequires: python3-libs |
| 33 | 33 |
BuildRequires: python3-setuptools |
| 34 | 34 |
BuildRequires: python3-xml |
| 35 |
+%if %{with_check}
|
|
| 36 |
+BuildRequires: python3-pytest |
|
| 37 |
+BuildRequires: python3-prompt_toolkit |
|
| 38 |
+%endif |
|
| 35 | 39 |
|
| 36 | 40 |
Requires: python3 |
| 37 | 41 |
Requires: python3-libs |
| 42 |
+Requires: python3-prompt_toolkit |
|
| 38 | 43 |
%description -n python3-pyvim |
| 39 | 44 |
Python 3 version. |
| 40 | 45 |
|
| 41 | 46 |
%prep |
| 42 | 47 |
%setup -q -n pyvim-%{version}
|
| 48 |
+tar -xf %{SOURCE1}
|
|
| 43 | 49 |
|
| 44 | 50 |
%build |
| 45 | 51 |
python2 setup.py build |
| ... | ... |
@@ -51,8 +67,8 @@ mv %{buildroot}/%{_bindir}/pyvim %{buildroot}/%{_bindir}/pyvim3
|
| 51 | 51 |
python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
| 52 | 52 |
|
| 53 | 53 |
%check |
| 54 |
-python2 setup.py test |
|
| 55 |
-python3 setup.py test |
|
| 54 |
+PYTHONPATH=./ py.test2 |
|
| 55 |
+PYTHONPATH=./ py.test3 |
|
| 56 | 56 |
|
| 57 | 57 |
%files |
| 58 | 58 |
%defattr(-,root,root) |
| ... | ... |
@@ -65,6 +81,8 @@ python3 setup.py test |
| 65 | 65 |
%{_bindir}/pyvim3
|
| 66 | 66 |
|
| 67 | 67 |
%changelog |
| 68 |
+* Mon Jul 24 2017 Divya Thaluru <dthaluru@vmware.com> 0.0.20-4 |
|
| 69 |
+- Fixed runtime dependencies and make check errors |
|
| 68 | 70 |
* Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 0.0.20-3 |
| 69 | 71 |
- Add python3-setuptools and python3-xml to python3 sub package Buildrequires. |
| 70 | 72 |
* Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.0.20-2 |