From ca3ea847ea6d42525ac4c30fe1af2c2b96516522 Mon Sep 17 00:00:00 2001 From: bodonoghue Date: Fri, 1 Jan 2016 21:02:08 +0000 Subject: [PATCH] bump to 1.1.9 --- .bumpversion.cfg | 2 +- include/constants.h | 2 +- matlab/scs.m | 2 +- python/setup.py | 2 +- r/DESCRIPTION | 2 +- r/configure.ac | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9e864b3f8..f1ed055ee 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.8 +current_version = 1.1.9 [bumpversion:file:python/setup.py] diff --git a/include/constants.h b/include/constants.h index c9584e430..825627365 100644 --- a/include/constants.h +++ b/include/constants.h @@ -6,7 +6,7 @@ extern "C" { #endif /* SCS VERSION NUMBER ---------------------------------------------- */ -#define SCS_VERSION ("1.1.8") /* string literals automatically null-terminated */ +#define SCS_VERSION ("1.1.9") /* 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 2a2205a0f..94d41f41f 100644 --- a/matlab/scs.m +++ b/matlab/scs.m @@ -1,5 +1,5 @@ function [ x, y, s, info ] = scs( varargin ) -% scs 1.1.8 +% scs 1.1.9 % for version call: scs_version() data = varargin{1}; K = varargin{2}; diff --git a/python/setup.py b/python/setup.py index 562954097..df3d7548f 100644 --- a/python/setup.py +++ b/python/setup.py @@ -81,7 +81,7 @@ def install_scs(USE_64_BIT_BLAS, blas_info, lapack_info, USE_OPENMP, rootDir): ext_modules += [_scs_gpu] setup(name='scs', - version='1.1.8', + version='1.1.9', author = 'Brendan O\'Donoghue', author_email = 'bodonoghue85@gmail.com', url = 'http://github.com/cvxgrp/scs', diff --git a/r/DESCRIPTION b/r/DESCRIPTION index dc9edfcc2..00f81afdd 100644 --- a/r/DESCRIPTION +++ b/r/DESCRIPTION @@ -1,5 +1,5 @@ Package: scs -Version: 1.1.8 +Version: 1.1.9 Title: SCS - Splitting Conic Solver Author: Brendan O'Donoghue Maintainer: Brendan O'Donoghue diff --git a/r/configure.ac b/r/configure.ac index e94adbf1c..7d584d727 100644 --- a/r/configure.ac +++ b/r/configure.ac @@ -1,6 +1,6 @@ dnl R interface to SCS -AC_INIT([scs], 1.1.8) +AC_INIT([scs], 1.1.9) SCS_FLAGS="-DLAPACK_LIB_FOUND -DCOPYAMATRIX -DUSING_R" SCS_LIBS="-lm"