Merge pull request #142 from isuruf/sage

Update libsymengine to 0.3.0 and update tests

Author: isuruf

.travis.yml

@@ -25,20 +25,17 @@ env:
   ## statement, so if the variable is not set, the other if branch will get
   ## executed.
   matrix:
-  ## Out of tree builds (default):
+  # Debug builds:
   - BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="2.7" TRIGGER_FEEDSTOCK="yes"
+  - BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="3.6"
 
-  ## In-tree builds (we just check a few configurations to make sure they work):
-  # Debug build with Python 2.7:
-  - BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="2.7"
-  # Release build shared lib with Python 2.7:
+  # Release builds:
   - PYTHON_VERSION="2.7" BUILD_SHARED_LIBS="yes"
-
-  # These test the setup.py file
-  - PYTHON_VERSION="2.7" WITH_MPFR="yes" INTEGER_CLASS="gmp"
+  - PYTHON_VERSION="2.7" WITH_MPFR="yes" INTEGER_CLASS="gmpxx"
   - PYTHON_VERSION="3.3" WITH_MPC="yes"
   - PYTHON_VERSION="3.4" WITH_MPFR="yes" WITH_NUMPY="yes"
-  - PYTHON_VERSION="3.5" WITH_MPFR="yes" WITH_NUMPY="yes"
+  - PYTHON_VERSION="3.5" WITH_MPC="yes" WITH_NUMPY="yes"
+  - PYTHON_VERSION="3.6" WITH_MPC="yes" WITH_NUMPY="yes"
 
 matrix:
   exclude:
@@ -81,13 +78,9 @@ matrix:
     - env: BUILD_TYPE="Release" PYTHON_VERSION="3.5"
       compiler: gcc
       os: osx
-    - env: BUILD_TYPE="Release" WITH_SAGE="yes" WITH_MPC="yes"
+    - env: BUILD_TYPE="Release" WITH_SAGE="yes" WITH_MPC="yes" PYTHON_VERSION="2.7"
       compiler: gcc
       os: linux
-      addons:
-        apt:
-          packages:
-          - lrzip
 
 install:
   - export PYTHON_SOURCE_DIR=`pwd`
@@ -100,12 +93,13 @@ install:
   - git checkout `cat ../symengine_version.txt`
   - cd ..
 
-  # Setup travis for Python wrappers
-  - source bin/install_travis.sh
-
   # Setup travis for C++ library
   - cd $SOURCE_DIR
-  - if [[ "${WITH_SAGE}" != "yes" ]]; then source bin/install_travis.sh; fi
+  - source bin/install_travis.sh
+
+  # Setup travis for Python wrappers
+  - cd $PYTHON_SOURCE_DIR
+  - source bin/install_travis.sh
 
   # Build C++ library
   - cd $SOURCE_DIR

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 project(python_wrapper)
 
 set(CMAKE_PREFIX_PATH ${SymEngine_DIR} ${CMAKE_PREFIX_PATH})
-find_package(SymEngine 0.2.0 REQUIRED CONFIG
+find_package(SymEngine 0.3.0 REQUIRED CONFIG
              PATH_SUFFIXES lib/cmake/symengine cmake/symengine CMake/)
 message("SymEngine_DIR : " ${SymEngine_DIR})
 set(CMAKE_BUILD_TYPE ${SYMENGINE_BUILD_TYPE})

bin/install_travis.sh

@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 
-if [[ "${WITH_SAGE}" != "yes" ]]; then
-    # symengine's bin/install_travis.sh will install miniconda
-    conda_pkgs="python=${PYTHON_VERSION} pip cython sympy nose pytest"
-    if [[ "${WITH_NUMPY}" == "yes" ]]; then
-        conda_pkgs="${conda_pkgs} numpy";
-    fi
-else
-    wget -O- https://dl.dropboxusercontent.com/u/46807346/sage-6.9-x86_64-Linux-Ubuntu_12.04_64_bit.tar.gz | tar xz
-    SAGE_ROOT=`pwd`/sage-6.9-x86_64-Linux
-    export PATH="$SAGE_ROOT:$PATH"
-    source $SAGE_ROOT/src/bin/sage-env
-    export our_install_dir=$SAGE_LOCAL
+# symengine's bin/install_travis.sh will install miniconda
+export conda_pkgs="python=${PYTHON_VERSION} pip cython sympy nose pytest"
+
+if [[ "${WITH_NUMPY}" == "yes" ]]; then
+    export conda_pkgs="${conda_pkgs} numpy";
+fi
+
+if [[ "${WITH_SAGE}" == "yes" ]]; then
+    export conda_pkgs="${conda_pkgs} sage";
 fi
+
+conda update -q -n root conda
+conda install ${conda_pkgs} libgap=4.8.3
+source activate $our_install_dir;

bin/test_travis.sh

@@ -9,17 +9,12 @@ set -x
 python setup.py install build_ext --inplace --symengine-dir=$our_install_dir
 
 # Test python wrappers
-if [[ "${WITH_SAGE}" != "yes" ]]; then
-    nosetests -v
-    # If switching to py.test, the following collects correct tests:
-    #py.test -v $PYTHON_SOURCE_DIR/symengine/tests/test_*.py
-    mkdir -p empty
-    cd empty
-    python $PYTHON_SOURCE_DIR/bin/test_python.py
-fi
-if [[ "${WITH_SAGE}" == "yes" ]]; then
-    sage -t $PYTHON_SOURCE_DIR/symengine/tests/test_sage.py
-fi
+nosetests -v
+# If switching to py.test, the following collects correct tests:
+#py.test -v $PYTHON_SOURCE_DIR/symengine/tests/test_*.py
+mkdir -p empty && cd empty
+python $PYTHON_SOURCE_DIR/bin/test_python.py
+cd ..
 
 if [[ "${TRIGGER_FEEDSTOCK}" == "yes" ]]; then
     cd $PYTHON_SOURCE_DIR

symengine/tests/test_sage.py

@@ -1,5 +1,5 @@
 from symengine import (Integer, symbols, sin, cos, pi, E, I, Add,
-    function_symbol, DenseMatrix, sympify)
+    function_symbol, DenseMatrix, sympify, log)
 from symengine.lib.symengine_wrapper import (PyNumber, PyFunction,
     sage_module, wrap_sage_function)
 

symengine_version.txt

@@ -1 +1 @@
-0172e47349b7d158ee8a7186eb0a19a7f155a225
+v0.3.0