[python-meliae] 0.4.0; add %check section * Tue Jan 24 2012 David Malcolm <dmalcolm at redhat.com> - 0.4.0-1 - 0.4.0 -

[dmalcolm]

commit 246c09783f2f03c67135770c553fe14e981e17ec
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Tue Jan 24 11:46:24 2012 -0500

    0.4.0; add %check section
    * Tue Jan 24 2012 David Malcolm <dmalcolm at redhat.com> - 0.4.0-1
    - 0.4.0
    - drop upstream patch 1 (meliae-0.2.0-fix-builtintype-heap-assertion.patch)
    - add a %%check section, running the upstream test suite

 .gitignore                                        |    1 +
 meliae-0.2.0-fix-builtintype-heap-assertion.patch |   31 ---------------------
 python-meliae.spec                                |   31 ++++++++++++---------
 sources                                           |    2 +-
 4 files changed, 20 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0bbc0fc..99b9082 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 meliae-0.2.0.tar.gz
+/meliae-0.4.0.tar.gz
diff --git a/python-meliae.spec b/python-meliae.spec
index 0288408..a5fba20 100644
--- a/python-meliae.spec
+++ b/python-meliae.spec
@@ -1,25 +1,16 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           python-meliae
-Version:        0.2.0
-Release:        6%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python memory usage statistics
 
 Group:          Development/Languages
 License:        GPLv3
 URL:            https://launchpad.net/meliae
-Source0:        http://launchpad.net/meliae/0.2/0.2.0/+download/meliae-0.2.0.tar.gz
+Source0:        http://launchpad.net/meliae/trunk/0.4/+download/meliae-0.4.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# I've seen assertion failures of the form:
-#    python: Objects/typeobject.c:2672: type_traverse: Assertion `type->tp_flags & (1L<<9)' failed.
-# which is:
-#     assert(type->tp_flags & Py_TPFLAGS_HEAPTYPE)
-# when visiting the <type> "object" (the most basic type)
-#
-# This patch bulletproofs against it:
-Patch1:         meliae-0.2.0-fix-builtintype-heap-assertion.patch
-
 BuildRequires:  python-devel
 BuildRequires:  Cython
 
@@ -31,7 +22,6 @@ The name is simply a fun word (means Ash-wood Nymph).
 
 %prep
 %setup -q -n meliae-%{version}
-%patch1 -p1 -b .fix-builtintype-heap-assertion
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -44,6 +34,16 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+# run_tests.py doesn't seem to work in the main directory: sys.path pulls in
+# the dir of the script, which contains meliae/intset.pyx, but the built
+# intset.so has been installed elsewhere in the tree, leading to:
+#   ImportError: cannot import name _intset
+# The meliae.tests directory isn't installed, so we do need to run from this
+# directory.
+# As a crude workaround, copy the .so files back into the source tree:
+cp $RPM_BUILD_ROOT/%{python_sitearch}/meliae/*.so meliae
+%{__python} run_tests.py --verbose
 
 %files
 %defattr(-,root,root,-)
@@ -54,6 +54,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 24 2012 David Malcolm <dmalcolm at redhat.com> - 0.4.0-1
+- 0.4.0
+- drop upstream patch 1 (meliae-0.2.0-fix-builtintype-heap-assertion.patch)
+- add a %%check section, running the upstream test suite
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 45c6baa..28aceca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21846ab82299ae1e30d3123a92a05ac0  meliae-0.2.0.tar.gz
+c704f4a314927fe96919018f67b2d3f3  meliae-0.4.0.tar.gz