Merge pull request #154 from ecell/tmp

version update via dep update

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 # cmake_minimum_required(VERSION 3.0)
 project(ecell4)
-set(PROJECT_VERSION 4.0.6)
+set(PROJECT_VERSION 4.0.7)
 
 if(ECELL4_ENABLE_PROFILING)
     add_definitions(-pg -O0)

appveyor.yml

@@ -2,7 +2,7 @@
 
 environment:
   global:
-    HDF_DIR: "C:/Program Files (x86)/HDF_Group/HDF5/1.8.16/lib"
+    HDF_DIR: "C:/Program Files (x86)/HDF_Group/HDF5/1.8.17/lib"
     BOOST_ROOT: C:\Libraries\boost
 
   matrix:
@@ -29,16 +29,16 @@ 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.16/download/win-32/hdf5-1.8.16-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.16-vc9_0.tar.bz2
-  - if "%PYTHON_VERSION%" == "2.7.12" 7z x -y hdf5-1.8.16-vc9_0.tar
-  - if "%PYTHON_VERSION%" == "3.5.2" if "%PYTHON_ARCH%" == "32" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.16/download/win-32/hdf5-1.8.16-vc14_0.tar.bz2
-  - if "%PYTHON_VERSION%" == "3.5.2" if "%PYTHON_ARCH%" == "64" curl -LvkO https://anaconda.org/anaconda/hdf5/1.8.16/download/win-64/hdf5-1.8.16-vc14_0.tar.bz2
-  - if "%PYTHON_VERSION%" == "3.5.2" 7z x -y hdf5-1.8.16-vc14_0.tar.bz2
-  - if "%PYTHON_VERSION%" == "3.5.2" 7z x -y hdf5-1.8.16-vc14_0.tar
-  - mkdir "C:/Program Files (x86)/HDF_Group/HDF5/1.8.16"
-  - xcopy Library "C:/Program Files (x86)/HDF_Group/HDF5/1.8.16" /s /e /y
+  - 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.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 "%PYTHON_VERSION%" == "3.5.2" 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 "%PYTHON_VERSION%" == "3.5.2" 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 "%PYTHON_VERSION%" == "3.5.2" 7z x -y hdf5-1.8.17-vc14_0.tar.bz2
+  - if "%PYTHON_VERSION%" == "3.5.2" 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
@@ -90,8 +90,8 @@ install:
   - 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.16\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.16\lib"
-  - if "%PYTHON_VERSION%" == "3.5.2" python setup.py build_ext -I"C:\Program Files (x86)\HDF_Group\HDF5\1.8.16\include";C:/Libraries/boost;C:/projects/ecell4/gsl -LC:/projects/ecell4/gsl/Release;"C:\Program Files (x86)\HDF_Group\HDF5\1.8.16\lib"
+  - 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 "%PYTHON_VERSION%" == "3.5.2" 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"
@@ -104,7 +104,7 @@ build: false
 branches:
   only:
     - master
-    - 4-1-stable
+    - tmp
 
 artifacts:
   # bdist_wheel puts your built wheel in the dist directory

readthedocs/conf.py

@@ -11,8 +11,8 @@
 copyright = u'2015-, E-Cell project'
 author = u'Kazunari Kaizu'
 
-version = '4.0.6'
-release = '4.0.6'
+version = '4.0.7'
+release = '4.0.7'
 
 language = None
 

requirements.txt

@@ -1,4 +1,4 @@
 recommonmark
 numpydoc
 pip>=8.1.2
-ecell>=4.0.6
+ecell>=4.0.7