enable support for SWIG 4.0 (#1159)

NanoComp · Mar 26, 2020 · 9aba9c0 · 9aba9c0
1 parent 221c64d
commit 9aba9c0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -520,11 +520,6 @@ AC_CHECK_PROG(SWIG, swig, swig, echo)
 if test "$USE_MAINTAINER_MODE" = yes && (test "x$with_python" = "xyes" || test "x$with_scheme" = "xyes") && test "x$SWIG" = xecho; then
   AC_MSG_ERROR([SWIG not found; configure --without-python --without-scheme or use a release tarball])
 fi
-if test "$USE_MAINTAINER_MODE" = yes && test "x$with_python" = "xyes"; then
-  if ($SWIG -version | grep "SWIG Version 4" > /dev/null 2>&1); then
-    AC_MSG_ERROR([SWIG version 4 is not supported for Python; configure --without-python or use a release tarball])
-  fi
-fi
 
 if test "x$with_python" = xno; then
   have_python=no

diff --git a/python/tests/simulation.py b/python/tests/simulation.py
@@ -487,7 +487,7 @@ def check_iterable(one, two, three, four):
             assert_two(v2)
             v3 = mp.vec(three)
             assert_three(v3)
-            assert_raises(four, NotImplementedError)
+            assert_raises(four, (NotImplementedError,TypeError))
 
         check_iterable([1], [1, 2], [1, 2, 3], [1, 2, 3, 4])
         check_iterable((1,), (1, 2), (1, 2, 3), (1, 2, 3, 4))