[python-ansi2html] Removed tests for python3 until python3-mock is available.

Ralph Bean ralph at fedoraproject.org
Mon Jul 9 20:04:14 UTC 2012


commit e7119ccea3633081c97b3443fd2e6cc498e3132e
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Jul 9 16:04:00 2012 -0400

    Removed tests for python3 until python3-mock is available.

 python-ansi2html.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/python-ansi2html.spec b/python-ansi2html.spec
index e21c241..ee34ec0 100644
--- a/python-ansi2html.spec
+++ b/python-ansi2html.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%if 0%{?fedora} > 1 || 0%{?rhel} > 6
 %global with_python3 1
 %endif
 
@@ -6,7 +6,7 @@
 
 Name:       python-ansi2html
 Version:    0.9.1
-Release:    1%{?dist}
+Release:    3%{?dist}
 Summary:    Python module that converts text with ANSI color to HTML
 
 Group:      Development/Libraries
@@ -18,15 +18,22 @@ BuildArch:  noarch
 BuildRequires:  python
 BuildRequires:  python-setuptools
 BuildRequires:  python-nose
+BuildRequires:  python-mock
 BuildRequires:  python-six
 
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-nose
+# FIXME -- blocking on https://bugzilla.redhat.com/show_bug.cgi?id=838695
+#BuildRequires:  python3-mock
 BuildRequires:  python3-six
 %endif
 
+%if %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:  python-ordereddict
+Requires:       python-ordereddict
+%endif
 
 Requires:   python
 Requires:   python-six
@@ -62,7 +69,8 @@ cp -a . %{py3dir}
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-%{__python3} setup.py test
+# FIXME -- blocking on https://bugzilla.redhat.com/show_bug.cgi?id=838695
+#%{__python3} setup.py test
 popd
 %endif
 
@@ -102,6 +110,10 @@ popd
 
 
 %changelog
+* Mon Jul 09 2012 Ralph Bean <rbean at redhat.com> - 0.9.1-3
+- Temporarily removed python3 tests until python3-mock is available.
+* Mon Jul 09 2012 Ralph Bean <rbean at redhat.com> - 0.9.1-2
+- Added requirements python-mock and python-ordereddict.
 * Mon Jul 09 2012 Ralph Bean <rbean at redhat.com> - 0.9.1-1
 - Latest upstream version.
 * Tue Jun 26 2012 Ralph Bean <rbean at redhat.com> - 0.9.0-4


More information about the scm-commits mailing list