Skip to content

Commit 35fda41

Browse files
author
bodonoghue
committed
bump version to 1.2.6 for pip release
1 parent 56b1ba3 commit 35fda41

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.2.5
2+
current_version = 1.2.6
33

44
[bumpversion:file:README.md]
55

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ convex optimization toolboxes [CVX](http://cvxr.com/cvx/) (3.0 or later),
1515
[Convex.jl](https://github.com/JuliaOpt/Convex.jl), and
1616
[Yalmip](https://github.com/johanlofberg/YALMIP).
1717

18-
The current version is `1.2.5`. If you wish to cite SCS, please use the following:
18+
The current version is `1.2.6`. If you wish to cite SCS, please use the following:
1919
```
2020
@article{ocpb:16,
2121
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
2727
}
2828
@misc{scs,
2929
author = {B. O'Donoghue and E. Chu and N. Parikh and S. Boyd},
30-
title = {{SCS}: Splitting Conic Solver, version 1.2.5},
30+
title = {{SCS}: Splitting Conic Solver, version 1.2.6},
3131
howpublished = {\url{https://github.com/cvxgrp/scs}},
3232
month = apr,
3333
year = 2016

include/constants.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern "C" {
77

88
/* SCS VERSION NUMBER ---------------------------------------------- */
99
#define SCS_VERSION \
10-
("1.2.5") /* string literals automatically null-terminated */
10+
("1.2.6") /* string literals automatically null-terminated */
1111

1212
/* SCS returns one of the following integers: */
1313
#define SCS_INFEASIBLE_INACCURATE (-7)

matlab/scs.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function [ x, y, s, info ] = scs( varargin )
2-
% scs 1.2.5
2+
% scs 1.2.6
33
% for version call: scs_version()
44
data = varargin{1};
55
K = varargin{2};

python/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def install_scs(**kwargs):
148148
ext_modules += [_scs_gpu]
149149

150150
setup(name='scs',
151-
version='1.2.5',
151+
version='1.2.6',
152152
author = 'Brendan O\'Donoghue',
153153
author_email = '[email protected]',
154154
url = 'http://github.com/cvxgrp/scs',

r/DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: scs
2-
Version: 1.2.5
2+
Version: 1.2.6
33
Title: SCS - Splitting Conic Solver
44
Author: Brendan O'Donoghue
55
Maintainer: Brendan O'Donoghue <[email protected]>

r/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl R interface to SCS
22

3-
AC_INIT([scs], 1.2.5)
3+
AC_INIT([scs], 1.2.6)
44

55
SCS_FLAGS="-DLAPACK_LIB_FOUND -DCOPYAMATRIX -DUSING_R"
66
SCS_LIBS="-lm"

0 commit comments

Comments
 (0)