Merge pull request #93 from isuruf/isuruf-patch-2

Fix version mismatch of gcc and libstdc++ in appveyor

Author: isuruf

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.1.0 REQUIRED CONFIG
+find_package(SymEngine 0.2.0 REQUIRED CONFIG
              PATH_SUFFIXES lib/cmake/symengine cmake/symengine CMake/)
 message("SymEngine_DIR : " ${SymEngine_DIR})
 set(CMAKE_BUILD_TYPE ${SYMENGINE_BUILD_TYPE})

appveyor.yml

@@ -16,19 +16,19 @@ environment:
     - BUILD_TYPE: "Release"
       COMPILER: MSVC15
       PLATFORM: "x64"
-      PYTHON_VERSION: 27-x64
+      PYTHON_VERSION: 35-x64
     - BUILD_TYPE: "Debug"
       COMPILER: MinGW
       PYTHON_VERSION: 27
     - BUILD_TYPE: "Release"
       COMPILER: MinGW
-      PYTHON_VERSION: 34
+      PYTHON_VERSION: 35
     - BUILD_TYPE: "Release"
       COMPILER: MinGW-w64
       PYTHON_VERSION: 27-x64
     - BUILD_TYPE: "Debug"
       COMPILER: MinGW-w64
-      PYTHON_VERSION: 27-x64
+      PYTHON_VERSION: 35-x64
 
 install:
 - set PYTHON_SOURCE_DIR=%CD%
@@ -44,6 +44,8 @@ install:
 
 - if [%COMPILER%]==[MinGW] set PATH=C:\MinGW\bin;%PATH%
 - if [%COMPILER%]==[MinGW] mingw-get update
+# workaround for https://github.com/appveyor/ci/issues/996
+- if [%COMPILER%]==[MinGW] mingw-get upgrade mingw32-libstdc++
 - if [%COMPILER%]==[MinGW] mingw-get install mingw32-gmp
 
 - if [%COMPILER%]==[MinGW-w64] set PATH=C:\mingw64\bin;%PATH%
@@ -88,7 +90,7 @@ build_script:
 test_script:
 - if not [%COMPILER%]==[MSVC15] nosetests
 - mkdir empty && cd empty
-- python %PYTHON_SOURCE_DIR%\bin\test_python.py
+- if [%COMPILER%]==[MinGW] if [%BUILD_TYPE%]==[RELEASE] python %PYTHON_SOURCE_DIR%\bin\test_python.py
 
 # Enable this to be able to login to the build worker. You can use the
 # `remmina` program in Ubuntu, use the login information that the line below

symengine/lib/pywrapper.cpp

@@ -27,7 +27,7 @@ PyNumber::PyNumber(PyObject* pyobject, const RCP<const PyModule> &pymodule) :
         pyobject_(pyobject), pymodule_(pymodule) {
 }
 
-std::size_t PyNumber::__hash__() const {
+hash_t PyNumber::__hash__() const {
     return PyObject_Hash(pyobject_);
 }
 
@@ -210,7 +210,7 @@ int PyFunctionClass::compare(const PyFunctionClass &x) const {
     return PyObject_RichCompareBool(pyobject_, x.pyobject_, Py_LT) == 1 ? 1 : -1;
 }
 
-std::size_t PyFunctionClass::hash() const {
+hash_t PyFunctionClass::hash() const {
     if (hash_ == 0)
         hash_ = PyObject_Hash(pyobject_);
     return hash_;
@@ -250,7 +250,7 @@ RCP<const Basic> PyFunction::diff_impl(const RCP<const Symbol> &s) const {
     return pyfunction_class_->get_py_module()->diff_(pyobject_, s);
 }
 
-std::size_t PyFunction::__hash__() const {
+hash_t PyFunction::__hash__() const {
     return PyObject_Hash(pyobject_);
 }
 

symengine/lib/symengine/pywrapper.h

@@ -102,7 +102,7 @@ class PyNumber : public NumberWrapper {
     virtual std::string __str__() const;
     virtual int compare(const Basic &o) const;
     virtual bool __eq__(const Basic &o) const;
-    virtual std::size_t __hash__() const;
+    virtual hash_t __hash__() const;
 };
 
 /*! Class to represent the parent class for a PyFunction. Stores
@@ -117,7 +117,7 @@ class PyFunctionClass : public EnableRCPFromThis<PyFunctionClass> {
     //! Name of the function
     std::string name_;
     //! Hash of the python function
-    mutable size_t hash_;
+    mutable hash_t hash_;
     //! PyModule that this python function belongs to
     RCP<const PyModule> pymodule_;
 public:
@@ -129,7 +129,7 @@ class PyFunctionClass : public EnableRCPFromThis<PyFunctionClass> {
     PyObject* call(const vec_basic &vec) const;
     bool __eq__(const PyFunctionClass &x) const;
     int compare(const PyFunctionClass &x) const;
-    std::size_t hash() const;
+    hash_t hash() const;
 };
 
 /*! Class to represent the parent class for a PyFunction. Stores
@@ -158,7 +158,7 @@ class PyFunction : public FunctionWrapper {
     virtual RCP<const Basic> diff_impl(const RCP<const Symbol> &x) const;
     virtual int compare(const Basic &o) const;
     virtual bool __eq__(const Basic &o) const;
-    virtual std::size_t __hash__() const;
+    virtual hash_t __hash__() const;
 };
 
 }

symengine_version.txt

@@ -1 +1 @@
-253bf6b393cdb6207551dd1525ec6ba0cc4ab5eb
+v0.2.0