bump to v1.1.5

cvxgrp · Jun 24, 2015 · 0f9f51d · 0f9f51d
1 parent 9de4349
commit 0f9f51d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.4
+current_version = 1.1.5
 
 [bumpversion:file:python/setup.py]
 
@@ -8,5 +8,6 @@ current_version = 1.1.4
 [bumpversion:file:matlab/scs.m]
 
 [bumpversion:file:r/configure.ac]
+
 [bumpversion:file:r/DESCRIPTION]
 
diff --git a/include/constants.h b/include/constants.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 /* SCS VERSION NUMBER ----------------------------------------------    */
-#define SCS_VERSION ("1.1.4")
+#define SCS_VERSION ("1.1.5")
 
 /* SCS returns one of the following integers:                           */
 #define SCS_INFEASIBLE_INACCURATE   (-7)

diff --git a/matlab/scs.m b/matlab/scs.m
@@ -1,5 +1,5 @@
 function [ x, y, s, info ] = scs( varargin )
-% scs 1.1.4
+% scs 1.1.5
 % for version call: scs_version()
 data = varargin{1};
 K = varargin{2};

diff --git a/python/setup.py b/python/setup.py
@@ -58,7 +58,7 @@ def install_scs(USE_64_BIT_BLAS, blas_info, lapack_info, USE_OPENMP, rootDir):
                         extra_compile_args=extra_compile_args
                         )
     setup(name='scs',
-            version='1.1.4',
+            version='1.1.5',
             author = 'Brendan O\'Donoghue',
             author_email = '[email protected]',
             url = 'http://github.com/cvxgrp/scs',

diff --git a/r/DESCRIPTION b/r/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: scs 
-Version: 1.1.4
+Version: 1.1.5
 Title: SCS - Splitting Conic Solver
 Author: Brendan O'Donoghue
 Maintainer: Brendan O'Donoghue <[email protected]> 

diff --git a/r/configure.ac b/r/configure.ac
@@ -1,6 +1,6 @@
 dnl R interface to SCS
 
-AC_INIT([scs], 1.1.4)
+AC_INIT([scs], 1.1.5)
 
 SCS_FLAGS="-DLAPACK_LIB_FOUND -DCOPYAMATRIX"
 SCS_LIBS="-lm"