Browse code
Fix makecheck - python-pyvim
Change-Id: Id750b475d572a72438ebb36f401f6d2a2e4ff7c0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6241
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
Tapas Kundu authored on 2018/11/27 09:44:34Showing 1 changed files
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Pure Python Vi Implementation. |
| 5 | 5 |
Name: python-pyvim |
| 6 | 6 |
Version: 2.0.22 |
| 7 |
-Release: 2%{?dist}
|
|
| 7 |
+Release: 3%{?dist}
|
|
| 8 | 8 |
License: UNKNOWN |
| 9 | 9 |
Group: Development/Languages/Python |
| 10 | 10 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -22,9 +22,23 @@ BuildRequires: python2 |
| 22 | 22 |
BuildRequires: python2-libs |
| 23 | 23 |
BuildRequires: python2-devel |
| 24 | 24 |
BuildRequires: python-setuptools |
| 25 |
+BuildRequires: python3-devel |
|
| 26 |
+BuildRequires: python3-libs |
|
| 27 |
+BuildRequires: python3-setuptools |
|
| 28 |
+BuildRequires: python3-xml |
|
| 25 | 29 |
%if %{with_check}
|
| 26 | 30 |
BuildRequires: python-pytest |
| 27 | 31 |
BuildRequires: python-prompt_toolkit |
| 32 |
+BuildRequires: python3-pytest |
|
| 33 |
+BuildRequires: python3-prompt_toolkit |
|
| 34 |
+BuildRequires: curl-devel |
|
| 35 |
+BuildRequires: openssl-devel |
|
| 36 |
+BuildRequires: python-atomicwrites |
|
| 37 |
+BuildRequires: python3-atomicwrites |
|
| 38 |
+BuildRequires: python-attrs |
|
| 39 |
+BuildRequires: python3-attrs |
|
| 40 |
+BuildRequires: python-xml |
|
| 41 |
+BuildRequires: python3-xml |
|
| 28 | 42 |
%endif |
| 29 | 43 |
|
| 30 | 44 |
Requires: python2 |
| ... | ... |
@@ -38,14 +52,6 @@ An implementation of Vim in Python. |
| 38 | 38 |
|
| 39 | 39 |
%package -n python3-pyvim |
| 40 | 40 |
Summary: python-pyvim |
| 41 |
-BuildRequires: python3-devel |
|
| 42 |
-BuildRequires: python3-libs |
|
| 43 |
-BuildRequires: python3-setuptools |
|
| 44 |
-BuildRequires: python3-xml |
|
| 45 |
-%if %{with_check}
|
|
| 46 |
-BuildRequires: python3-pytest |
|
| 47 |
-BuildRequires: python3-prompt_toolkit |
|
| 48 |
-%endif |
|
| 49 | 41 |
|
| 50 | 42 |
Requires: python3 |
| 51 | 43 |
Requires: python3-libs |
| ... | ... |
@@ -67,7 +73,11 @@ mv %{buildroot}/%{_bindir}/pyvim %{buildroot}/%{_bindir}/pyvim3
|
| 67 | 67 |
python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
| 68 | 68 |
|
| 69 | 69 |
%check |
| 70 |
+easy_install_2=$(ls /usr/bin |grep easy_install |grep 2) |
|
| 71 |
+$easy_install_2 pathlib2 funcsigs pluggy more-itertools pyflakes |
|
| 70 | 72 |
PYTHONPATH=./ py.test2 |
| 73 |
+easy_install_3=$(ls /usr/bin |grep easy_install |grep 3) |
|
| 74 |
+$easy_install_3 pathlib2 funcsigs pluggy more-itertools pyflakes |
|
| 71 | 75 |
PYTHONPATH=./ py.test3 |
| 72 | 76 |
|
| 73 | 77 |
%files |
| ... | ... |
@@ -81,6 +91,8 @@ PYTHONPATH=./ py.test3 |
| 81 | 81 |
%{_bindir}/pyvim3
|
| 82 | 82 |
|
| 83 | 83 |
%changelog |
| 84 |
+* Mon Nov 26 2018 Tapas Kundu <tkundu@vmware.com> 2.0.22-3 |
|
| 85 |
+- Fix makecheck |
|
| 84 | 86 |
* Fri Sep 21 2018 Alexey Makhalov <amakhalov@vmware.com> 2.0.22-2 |
| 85 | 87 |
- Use --no-same-owner for tar |
| 86 | 88 |
* Sun Sep 09 2018 Tapas Kundu <tkundu@vmware.com> 2.0.22-1 |