chore(release): 4.1.3

ecell · Jan 24, 2018 · fb7d344 · fb7d344
1 parent 0092195
commit fb7d344
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 # cmake_minimum_required(VERSION 3.0)
 project(ecell4)
-set(PROJECT_VERSION 4.1.2)
+set(PROJECT_VERSION 4.1.3)
 
 if(ECELL4_ENABLE_PROFILING)
     add_definitions(-pg -O0)

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,28 +7,28 @@ environment:
 
   matrix:
     - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.12"
+      PYTHON_VERSION: "2.7.14"
       PYTHON_ARCH: "32"
 
     # - PYTHON: "C:\\Python27-x64"
     #   PYTHON_VERSION: "2.7.12"
     #   PYTHON_ARCH: "64"
 
     - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.2"
+      PYTHON_VERSION: "3.5.3"
       PYTHON_ARCH: "32"
 
     - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.2"
+      PYTHON_VERSION: "3.5.3"
       PYTHON_ARCH: "64"
 
     - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: "3.6"
+      PYTHON_VERSION: "3.6.4"
       PYTHON_ARCH: "32"
 #      VCVARSALL: "x86"
 
     - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6"
+      PYTHON_VERSION: "3.6.4"
       PYTHON_ARCH: "64"
 #      VCVARSALL: "x64"
 
@@ -41,44 +41,44 @@ install:
   # install hdf5
   - mkdir hdf5lib
   - cd hdf5lib
-  - if "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "32" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.17/download/win-32/hdf5-1.8.17-vc9_0.tar.bz2
+  - if "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "32" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.17/download/win-32/hdf5-1.8.17-vc9_0.tar.bz2
   #- if "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "64" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.16/download/win-64/hdf5-1.8.16-vc9_0.tar.bz2
-  - if "%PYTHON_VERSION%" == "2.7.12" 7z x -y hdf5-1.8.17-vc9_0.tar.bz2
-  - if "%PYTHON_VERSION%" == "2.7.12" 7z x -y hdf5-1.8.17-vc9_0.tar
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "32" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.17/download/win-32/hdf5-1.8.17-vc14_0.tar.bz2
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "64" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.17/download/win-64/hdf5-1.8.17-vc14_0.tar.bz2
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" 7z x -y hdf5-1.8.17-vc14_0.tar.bz2
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" 7z x -y hdf5-1.8.17-vc14_0.tar
+  - if "%PYTHON_VERSION%" == "2.7.14" 7z x -y hdf5-1.8.17-vc9_0.tar.bz2
+  - if "%PYTHON_VERSION%" == "2.7.14" 7z x -y hdf5-1.8.17-vc9_0.tar
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "32" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.17/download/win-32/hdf5-1.8.17-vc14_0.tar.bz2
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "64" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.17/download/win-64/hdf5-1.8.17-vc14_0.tar.bz2
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" 7z x -y hdf5-1.8.17-vc14_0.tar.bz2
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" 7z x -y hdf5-1.8.17-vc14_0.tar
   - mkdir "C:/Program Files (x86)/HDF_Group/HDF5/1.8.17"
   - xcopy Library "C:/Program Files (x86)/HDF_Group/HDF5/1.8.17" /s /e /y
   - cd ..
 
   # install stdint
-  - if "%PYTHON_VERSION%" == "2.7.12" curl -O http://ftp.vector.co.jp/43/28/2114/stdint-20070624.zip
-  - if "%PYTHON_VERSION%" == "2.7.12" unzip stdint-20070624.zip
+  - if "%PYTHON_VERSION%" == "2.7.14" curl -O http://ftp.vector.co.jp/43/28/2114/stdint-20070624.zip
+  - if "%PYTHON_VERSION%" == "2.7.14" unzip stdint-20070624.zip
 
   # install gsl for build_ext
 
-  - if "%PYTHON_VERSION%" == "2.7.12" curl -O http://r2d3.geldreich.net/downloads/gsl-1.13-windows-binaries.zip
-  - if "%PYTHON_VERSION%" == "2.7.12" unzip gsl-1.13-windows-binaries.zip
+  - if "%PYTHON_VERSION%" == "2.7.14" curl -O http://r2d3.geldreich.net/downloads/gsl-1.13-windows-binaries.zip
+  - if "%PYTHON_VERSION%" == "2.7.14" unzip gsl-1.13-windows-binaries.zip
   # - if "%PYTHON_VERSION%" == "2.7.12" cmake -G "Visual Studio 9 2008" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_RELEASE="/MD" -D CMAKE_C_FLAGS_DEBUG="/MDd" .
   # - if "%PYTHON_VERSION%" == "2.7.12" msbuild GSL.sln /p:Configuration=Release /toolsversion:3.5
 
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" git clone git://github.com/ampl/gsl.git
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" cd gsl
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "32" cmake -G "Visual Studio 14 2015" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_RELEASE="/MD" -D CMAKE_C_FLAGS_DEBUG="/MDd" .
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "64" cmake -G "Visual Studio 14 2015 Win64" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_RELEASE="/MD" -D CMAKE_C_FLAGS_DEBUG="/MDd" .
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" msbuild GSL.sln /p:Configuration=Release
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" cd ..
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" git clone git://github.com/ampl/gsl.git
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" cd gsl
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "32" cmake -G "Visual Studio 14 2015" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_RELEASE="/MD" -D CMAKE_C_FLAGS_DEBUG="/MDd" .
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "64" cmake -G "Visual Studio 14 2015 Win64" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_RELEASE="/MD" -D CMAKE_C_FLAGS_DEBUG="/MDd" .
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" msbuild GSL.sln /p:Configuration=Release
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" cd ..
 
   # - msbuild GSL.sln /p:Configuration=Release /v:d
 
-  - if "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "32" cmake -G "Visual Studio 9 2008" -D CMAKE_CXX_FLAGS_RELEASE="/MT" -D CMAKE_CXX_FLAGS_DEBUG="/MTd" -DBOOST_REGEX_LIBRARIES=C:/Libraries/boost/libs -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl/include -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/lib -DGSL_LIBRARIES=C:/projects/ecell4/gsl/lib -DNO_SHARED:BOOL=1 -DNO_BESSEL_TABLE:BOOL=1 .
+  - if "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "32" cmake -G "Visual Studio 9 2008" -D CMAKE_CXX_FLAGS_RELEASE="/MT" -D CMAKE_CXX_FLAGS_DEBUG="/MTd" -DBOOST_REGEX_LIBRARIES=C:/Libraries/boost/libs -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl/include -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/lib -DGSL_LIBRARIES=C:/projects/ecell4/gsl/lib -DNO_SHARED:BOOL=1 -DNO_BESSEL_TABLE:BOOL=1 .
   # - if "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "64" "C:\Users\appveyor\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\vcvarsall.bat" amd64
   # - if "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "64" cmake -G "Visual Studio 9 2008 Win64" -D CMAKE_C_COMPILER="C:/Users/appveyor/AppData/Local/Programs/Common/Microsoft/Visual C++ for Python/9.0/VC/bin/amd64/cl.exe" -D CMAKE_CXX_COMPILER="C:/Users/appveyor/AppData/Local/Programs/Common/Microsoft/Visual C++ for Python/9.0/VC/bin/amd64/cl.exe" -D CMAKE_CXX_FLAGS_RELEASE="/MT" -D CMAKE_CXX_FLAGS_DEBUG="/MTd" -DBOOST_REGEX_LIBRARIES=C:/Libraries/boost/libs -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl/include -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/lib -DGSL_LIBRARIES=C:/projects/ecell4/gsl/lib -DNO_SHARED:BOOL=1 .
-  - if "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "64" cmake -G "Visual Studio 9 2008 Win64" -D CMAKE_CXX_FLAGS_RELEASE="/MT" -D CMAKE_CXX_FLAGS_DEBUG="/MTd" -DBOOST_REGEX_LIBRARIES=C:/Libraries/boost/libs -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl/include -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/lib -DGSL_LIBRARIES=C:/projects/ecell4/gsl/lib -DNO_SHARED:BOOL=1 -DNO_BESSEL_TABLE:BOOL=1 .
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "32" cmake -G "Visual Studio 14 2015" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_DEBUG="/MDd" -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/Release -DGSL_LIBRARIES=C:/projects/ecell4/gsl/Release -DNO_SHARED:BOOL=1 -DNO_BESSEL_TABLE:BOOL=1 .
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" if "%PYTHON_ARCH%" == "64" cmake -G "Visual Studio 14 2015 Win64" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_DEBUG="/MDd" -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/Release -DGSL_LIBRARIES=C:/projects/ecell4/gsl/Release -DNO_SHARED:BOOL=1 -DNO_BESSEL_TABLE:BOOL=1 .
+  - if "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "64" cmake -G "Visual Studio 9 2008 Win64" -D CMAKE_CXX_FLAGS_RELEASE="/MT" -D CMAKE_CXX_FLAGS_DEBUG="/MTd" -DBOOST_REGEX_LIBRARIES=C:/Libraries/boost/libs -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl/include -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/lib -DGSL_LIBRARIES=C:/projects/ecell4/gsl/lib -DNO_SHARED:BOOL=1 -DNO_BESSEL_TABLE:BOOL=1 .
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "32" cmake -G "Visual Studio 14 2015" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_DEBUG="/MDd" -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/Release -DGSL_LIBRARIES=C:/projects/ecell4/gsl/Release -DNO_SHARED:BOOL=1 -DNO_BESSEL_TABLE:BOOL=1 .
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" if "%PYTHON_ARCH%" == "64" cmake -G "Visual Studio 14 2015 Win64" -D CMAKE_CXX_FLAGS_RELEASE="/MD" -D CMAKE_CXX_FLAGS_DEBUG="/MDd" -D CMAKE_C_FLAGS_DEBUG="/MDd" -DBoost_INCLUDE_DIR=C:/Libraries/boost -DGSL_INCLUDE_DIR=C:/projects/ecell4/gsl -DGSL_CBLAS_LIBRARIES=C:/projects/ecell4/gsl/Release -DGSL_LIBRARIES=C:/projects/ecell4/gsl/Release -DNO_SHARED:BOOL=1 -DNO_BESSEL_TABLE:BOOL=1 .
 
   # config.h
   - cd ecell4/core
@@ -93,15 +93,15 @@ install:
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   - curl -O https://bootstrap.pypa.io/get-pip.py
   - "python get-pip.py"
-  - if "%PYTHON_VERSION%" == "2.7.12" python -m pip install cython
+  - if "%PYTHON_VERSION%" == "2.7.14" python -m pip install cython
   # - if "%PYTHON_VERSION%" == "3.5.2" python -m pip install https://pypi.python.org/packages/cp35/C/Cython/Cython-0.23.4-cp35-none-win32.whl
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" python -m pip install Cython --install-option="--no-cython-compile"
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" python -m pip install Cython --install-option="--no-cython-compile"
   - cd python
   - ECHO "ls boost:"
   - ps: "ls \"C:/Libraries/boost\""
   - echo %CD%
-  - if "%PYTHON_VERSION%" == "2.7.12" python setup.py build_ext -I"C:\Program Files (x86)\HDF_Group\HDF5\1.8.17\include";C:/Libraries/boost;C:/projects/ecell4;C:/projects/ecell4/stdint-20070624;C:/projects/ecell4/gsl/include -LC:/projects/ecell4/gsl/lib;"C:\Program Files (x86)\HDF_Group\HDF5\1.8.17\lib"
-  - if NOT "%PYTHON_VERSION%" == "2.7.12" python setup.py build_ext -I"C:\Program Files (x86)\HDF_Group\HDF5\1.8.17\include";C:/Libraries/boost;C:/projects/ecell4/gsl -LC:/projects/ecell4/gsl/Release;"C:\Program Files (x86)\HDF_Group\HDF5\1.8.17\lib"
+  - if "%PYTHON_VERSION%" == "2.7.14" python setup.py build_ext -I"C:\Program Files (x86)\HDF_Group\HDF5\1.8.17\include";C:/Libraries/boost;C:/projects/ecell4;C:/projects/ecell4/stdint-20070624;C:/projects/ecell4/gsl/include -LC:/projects/ecell4/gsl/lib;"C:\Program Files (x86)\HDF_Group\HDF5\1.8.17\lib"
+  - if NOT "%PYTHON_VERSION%" == "2.7.14" python setup.py build_ext -I"C:\Program Files (x86)\HDF_Group\HDF5\1.8.17\include";C:/Libraries/boost;C:/projects/ecell4/gsl -LC:/projects/ecell4/gsl/Release;"C:\Program Files (x86)\HDF_Group\HDF5\1.8.17\lib"
   - "pip install wheel"
   - "python setup.py bdist_wheel -v"
   # - "pip install dist/ecell4-4.0.0b2-cp35-none-win32.whl"

diff --git a/circle.yml b/circle.yml
@@ -12,7 +12,7 @@ jobs:
           name: Build E-Cell4
           command: |
             set -x
-            ECELLVER="4.1.2"
+            ECELLVER="4.1.3"
             PY27="cp27-cp27mu"
             PY35="cp35-cp35m"
             PY36="cp36-cp36m"