Merge lp:~thisfred/u1db/dont-install-cython-wrapper into lp:u1db

[Eric Casteleijn]

Made setup.py not build cython wrapper by default.

Made setup.py not build cython wrapper by default.

[Samuele Pedroni (pedronis)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~thisfred/u1db/dont-install-cython-wrapper into lp:u1db failed. Below is the output from the failed tests.

-- The C compiler identification is GNU 4.7.1
-- The CXX compiler identification is GNU 4.7.1
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found Cython: /usr/bin/cython
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so (found version "7.27.0")
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.26")
-- checking for module 'oauth'
-- found oauth, version 0.9.7
-- Found OAuth: /usr/lib/x86_64-linux-gnu/liboauth.so
-- checking for module 'json'
-- found json, version 0.10
-- Found JSON: /usr/lib/x86_64-linux-gnu/libjson.so
-- checking for module 'sqlite3'
-- found sqlite3, version 3.7.13
-- Found Sqlite3: /usr/lib/x86_64-linux-gnu/libsqlite3.so
-- Configuring done
-- Generating done
-- Build files have been written to: /mnt/tarmac/cache/u1db/trunk
Scanning dependencies of target ReplicatePythonSourceTree
[ 0%] Built target ReplicatePythonSourceTree
[ 11%] Generating u1db_schema.c
Scanning dependencies of target u1db
[ 22%] Building C object src/CMakeFiles/u1db.dir/mkstemp_compat.c.o
[ 33%] Building C object src/CMakeFiles/u1db.dir/u1db.c.o
[ 44%] Building C object src/CMakeFiles/u1db.dir/u1db_http_sync_target.c.o
[ 55%] Building C object src/CMakeFiles/u1db.dir/u1db_query.c.o
[ 66%] Building C object src/CMakeFiles/u1db.dir/u1db_sync_target.c.o
[ 77%] Building C object src/CMakeFiles/u1db.dir/u1db_uuid.c.o
[ 88%] Building C object src/CMakeFiles/u1db.dir/u1db_vectorclock.c.o
[100%] Building C object src/CMakeFiles/u1db.dir/u1db_schema.c.o
Linking C static library libu1db.a
[100%] Built target u1db
Scanning dependencies of target build-debug
running build_ext
[100%] Built target build-debug
Scanning dependencies of target check-valgrind
Tests running...
======================================================================
FAIL: u1db.tests.test_c_backend.TestCDatabaseExists.test_c_backend_compiled
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/mnt/tarmac/cache/u1db/trunk/u1db/tests/test_c_backend.py", line 38, in test_c_backend_compiled
    " Was it compiled properly?\n%s" % (c_backend_error,))
AssertionError: Could not import the c_backend_wrapper module. Was it compiled properly?
cannot import name c_backend_wrapper

Ran 1455 tests in 162.349s
FAILED (failures=1)

[59005 refs]
==2975== Memcheck, a memory error detector
==2975== Copyright (C) 2002-2011, and GNU GPL'd, by Julian Seward et al.
==2975== Using Valgrind-3.7.0 and LibVEX; rerun with -h for copyright info
==2975== Command: python-dbg -m testtools.run discover
==2975==
[168478 refs]
==2975==
==2975== HEAP SUMMARY:
==2975== in use at exit: 23,995,807 bytes in 9,372 blocks
==2975== total heap usage: 1,276,168 allocs, 1,266,796 frees, 632,798,209 bytes ...

[Samuele Pedroni (pedronis)]

a more meditated +1 :)

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-08-21 20:06:02 +0000
+++ CMakeLists.txt	2012-09-07 16:55:22 +0000
@@ -46,12 +46,12 @@
 
 add_custom_target(check-nodoc
     COMMAND python -m testtools.run discover
-    DEPENDS build-inplace
+    DEPENDS build-inplace-for-tests
 )
 
 add_custom_target(check
     COMMAND python -m testtools.run discover
-    DEPENDS build-inplace doctests
+    DEPENDS build-inplace-for-tests doctests
 )
 
 add_custom_target(cdocs
@@ -68,19 +68,28 @@
     DEPENDS ReplicatePythonSourceTree u1db
 )
 
+add_custom_target(build-inplace-for-tests
+    COMMAND U1DB_TEST=1 python setup.py build_ext -i -f -I ${CMAKE_SOURCE_DIR}/include
+    DEPENDS ReplicatePythonSourceTree u1db
+)
+
+add_custom_target(build-debug-for-tests
+    COMMAND U1DB_TEST=1 python-dbg setup.py build_ext -i -f -I ${CMAKE_SOURCE_DIR}/include
+    DEPENDS ReplicatePythonSourceTree u1db
+)
 add_custom_target(check-valgrind
     COMMAND valgrind --tool=memcheck --suppressions=${CMAKE_SOURCE_DIR}/custom.supp python-dbg -m testtools.run discover
-    DEPENDS build-debug
+    DEPENDS build-debug-for-tests
 )
 
 add_custom_target(check-valgrind-leaks
     COMMAND valgrind --tool=memcheck --suppressions=${CMAKE_SOURCE_DIR}/custom.supp --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full python-dbg -m testtools.run discover
-    DEPENDS build-debug
+    DEPENDS build-debug-for-tests
 )
 
 add_custom_target(check-verbose
-    COMMAND python -c \"import unittest, sys\; from testtools import run\; run.TestProgram(argv=sys.argv, testRunner=unittest.TextTestRunner(verbosity=2), stdout=sys.stdout)\" discover
-    DEPENDS build-inplace
+    COMMAND U1DB_TEST=1 python -c \"import unittest, sys\; from testtools import run\; run.TestProgram(argv=sys.argv, testRunner=unittest.TextTestRunner(verbosity=2), stdout=sys.stdout)\" discover
+    DEPENDS build-inplace-for-tests
 )
 
 add_custom_target(html-docs

=== modified file 'setup.py'
--- setup.py	2012-08-14 14:31:45 +0000
+++ setup.py	2012-09-07 16:55:22 +0000
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with u1db.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import sys
 
 
@@ -63,31 +64,32 @@
 synchronize them with other stores.
 """
     }
-    try:
-        from Cython.Distutils import build_ext
-    except ImportError:
-        print "Unable to import Cython, to test the C implementation"
-    else:
-        kwargs["cmdclass"] = {"build_ext": build_ext}
-        extra_libs = []
-        extra_defines = []
-        if sys.platform == 'win32':
-            # Used for the random number generator
-            extra_libs.append('advapi32')
-            extra_libs.append('libcurl_imp')
-            extra_libs.append('libeay32')
-            extra_defines = [('_CRT_SECURE_NO_WARNINGS', 1)]
+    if "U1DB_TEST" in os.environ:
+        try:
+            from Cython.Distutils import build_ext
+        except ImportError:
+            print "Unable to import Cython, to test the C implementation"
         else:
-            extra_libs.append('curl')
-        extra_libs.append('json')
-        ext.append(Extension(
-            "u1db.tests.c_backend_wrapper",
-            ["u1db/tests/c_backend_wrapper.pyx"],
-            include_dirs=['include'],
-            library_dirs=["src"],
-            libraries=['u1db', 'sqlite3', 'oauth'] + extra_libs,
-            define_macros=[] + extra_defines,
-            ))
+            kwargs["cmdclass"] = {"build_ext": build_ext}
+            extra_libs = []
+            extra_defines = []
+            if sys.platform == 'win32':
+                # Used for the random number generator
+                extra_libs.append('advapi32')
+                extra_libs.append('libcurl_imp')
+                extra_libs.append('libeay32')
+                extra_defines = [('_CRT_SECURE_NO_WARNINGS', 1)]
+            else:
+                extra_libs.append('curl')
+            extra_libs.append('json')
+            ext.append(Extension(
+                "u1db.tests.c_backend_wrapper",
+                ["u1db/tests/c_backend_wrapper.pyx"],
+                include_dirs=['include'],
+                library_dirs=["src"],
+                libraries=['u1db', 'sqlite3', 'oauth'] + extra_libs,
+                define_macros=[] + extra_defines,
+                ))
     setup(**kwargs)
 
 if __name__ == "__main__":