Working commit for cmf1.5, will be merged into master

philippkraft · Mar 26, 2019 · 759c17d · 759c17d
1 parent c299357
commit 759c17d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -86,6 +86,7 @@ venv.bak/
 
 # PyCharm
 .idea
+cmake-build-*/
 
 # Rope project settings
 .ropeproject

diff --git a/cmf/__init__.py b/cmf/__init__.py
@@ -23,7 +23,7 @@
 
 
 __version__ = '1.5.0a.cmf_1_5'
-__compiletime__ = 'Mon Mar 25 21:20:29 2019'
+__compiletime__ = 'Mon Mar 25 22:31:25 2019'
 
 from .cmf_core import connect_cells_with_flux as __ccwf
 

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@
 from distutils.sysconfig import customize_compiler
 from distutils.command.build_py import build_py
 
-version = '1.5.0a'
+version = '1.5.0'
 branchversion = version
 try:
  from pygit2 import Repository