From 35fda417449b358f54092149e131a3f67f5a9514 Mon Sep 17 00:00:00 2001
From: bodonoghue <bodonoghue@quantcast.com>
Date: Thu, 28 Apr 2016 18:38:00 +0100
Subject: [PATCH] bump version to 1.2.6 for pip release

---
 .bumpversion.cfg    | 2 +-
 README.md           | 4 ++--
 include/constants.h | 2 +-
 matlab/scs.m        | 2 +-
 python/setup.py     | 2 +-
 r/DESCRIPTION       | 2 +-
 r/configure.ac      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 08453852c..843ee44b1 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.5
+current_version = 1.2.6
 
 [bumpversion:file:README.md]
 
diff --git a/README.md b/README.md
index 22bddc5c4..8f890aebc 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ convex optimization toolboxes [CVX](http://cvxr.com/cvx/) (3.0 or later),
 [Convex.jl](https://github.com/JuliaOpt/Convex.jl), and
 [Yalmip](https://github.com/johanlofberg/YALMIP).
 
-The current version is `1.2.5`. If you wish to cite SCS, please use the following:
+The current version is `1.2.6`. If you wish to cite SCS, please use the following:
 ```
 @article{ocpb:16,
     author       = {B. O'Donoghue and E. Chu and N. Parikh and S. Boyd},
@@ -27,7 +27,7 @@ The current version is `1.2.5`. If you wish to cite SCS, please use the followin
 }
 @misc{scs,
     author       = {B. O'Donoghue and E. Chu and N. Parikh and S. Boyd},
-    title        = {{SCS}: Splitting Conic Solver, version 1.2.5},
+    title        = {{SCS}: Splitting Conic Solver, version 1.2.6},
     howpublished = {\url{https://github.com/cvxgrp/scs}},
     month        = apr,
     year         = 2016
diff --git a/include/constants.h b/include/constants.h
index b5f183a82..d13ba6b53 100644
--- a/include/constants.h
+++ b/include/constants.h
@@ -7,7 +7,7 @@ extern "C" {
 
 /* SCS VERSION NUMBER ----------------------------------------------    */
 #define SCS_VERSION                                                            \
-    ("1.2.5") /* string literals automatically null-terminated */
+    ("1.2.6") /* 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
index ab2c24945..6ffcd6173 100644
--- a/matlab/scs.m
+++ b/matlab/scs.m
@@ -1,5 +1,5 @@
 function [ x, y, s, info ] = scs( varargin )
-% scs 1.2.5
+% scs 1.2.6
 % for version call: scs_version()
 data = varargin{1};
 K = varargin{2};
diff --git a/python/setup.py b/python/setup.py
index 90766245a..031a5dcd9 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -148,7 +148,7 @@ def install_scs(**kwargs):
         ext_modules += [_scs_gpu]
 
     setup(name='scs',
-            version='1.2.5',
+            version='1.2.6',
             author = 'Brendan O\'Donoghue',
             author_email = 'bodonoghue85@gmail.com',
             url = 'http://github.com/cvxgrp/scs',
diff --git a/r/DESCRIPTION b/r/DESCRIPTION
index 38bdb5717..b8ab701e1 100644
--- a/r/DESCRIPTION
+++ b/r/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: scs 
-Version: 1.2.5
+Version: 1.2.6
 Title: SCS - Splitting Conic Solver
 Author: Brendan O'Donoghue
 Maintainer: Brendan O'Donoghue <bodonoghue85@gmail.com> 
diff --git a/r/configure.ac b/r/configure.ac
index 112fc96e4..8ca23c8a8 100644
--- a/r/configure.ac
+++ b/r/configure.ac
@@ -1,6 +1,6 @@
 dnl R interface to SCS
 
-AC_INIT([scs], 1.2.5)
+AC_INIT([scs], 1.2.6)
 
 SCS_FLAGS="-DLAPACK_LIB_FOUND -DCOPYAMATRIX -DUSING_R"
 SCS_LIBS="-lm"