bump to 1.2.2 for pip update

cvxgrp · Feb 18, 2016 · 200f31e · 200f31e
1 parent 210b3ce
commit 200f31e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.1
+current_version = 1.2.2
 
 [bumpversion:file:python/setup.py]
 

diff --git a/include/constants.h b/include/constants.h
@@ -7,7 +7,7 @@ extern "C" {
 
 /* SCS VERSION NUMBER ----------------------------------------------    */
 #define SCS_VERSION                                                            \
-    ("1.2.1") /* string literals automatically null-terminated */
+    ("1.2.2") /* string literals automatically null-terminated */
 
 /* 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.2.1
+% scs 1.2.2
 % for version call: scs_version()
 data = varargin{1};
 K = varargin{2};

diff --git a/python/setup.py b/python/setup.py
@@ -149,7 +149,7 @@ def install_scs(**kwargs):
         ext_modules += [_scs_gpu]
 
     setup(name='scs',
-            version='1.2.1',
+            version='1.2.2',
             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.2.1
+Version: 1.2.2
 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.2.1)
+AC_INIT([scs], 1.2.2)
 
 SCS_FLAGS="-DLAPACK_LIB_FOUND -DCOPYAMATRIX -DUSING_R"
 SCS_LIBS="-lm"