Skip to content

Commit

Permalink
Bump version: 0.2.0.dev1 → 0.2.0.dev2
Browse files Browse the repository at this point in the history
  • Loading branch information
bstellato committed Nov 7, 2017
1 parent 3583cd0 commit c62fe67
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.2.0.dev1
current_version = 0.2.0.dev2
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ subject to l <= A x <= u
where `x in R^n` is the optimization variable. The objective function is defined by a positive semidefinite matrix `P in S^n_+` and vector `q in R^n`. The linear constraints are defined by matrix `A in R^{m x n}` and vectors `l in R^m U {-inf}^m`, `u in R^m U {+inf}^m`.


The latest version is `0.2.0.dev1`.
The latest version is `0.2.0.dev2`.

<br>

Expand Down
8 changes: 4 additions & 4 deletions ci/appveyor/deploy.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ IF "%PYTHON_VERSION%" == "3.6" (
cd %APPVEYOR_BUILD_FOLDER%\build\out

IF "%PLATFORM%" == "x86" (
set OSQP_DEPLOY_DIR=osqp-0.2.0.dev1-windows32
set OSQP_DEPLOY_DIR=osqp-0.2.0.dev2-windows32
) ELSE (
set OSQP_DEPLOY_DIR=osqp-0.2.0.dev1-windows64
set OSQP_DEPLOY_DIR=osqp-0.2.0.dev2-windows64
)
REM Create directories
mkdir %OSQP_DEPLOY_DIR%
Expand All @@ -29,11 +29,11 @@ IF "%PYTHON_VERSION%" == "3.6" (
7z a -tgzip %OSQP_DEPLOY_DIR%.tar.gz %OSQP_DEPLOY_DIR%.tar

REM Deploy to Bintray
curl -T %OSQP_DEPLOY_DIR%.tar.gz -ubstellato:%BINTRAY_API_KEY% -H "X-Bintray-Package:OSQP" -H "X-Bintray-Version:0.2.0.dev1" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev1/
curl -T %OSQP_DEPLOY_DIR%.tar.gz -ubstellato:%BINTRAY_API_KEY% -H "X-Bintray-Package:OSQP" -H "X-Bintray-Version:0.2.0.dev2" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev2/
if errorlevel 1 exit /b 1

REM Publish
curl -X POST -ubstellato:%BINTRAY_API_KEY% https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev1/publish
curl -X POST -ubstellato:%BINTRAY_API_KEY% https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev2/publish
if errorlevel 1 exit /b 1
)

Expand Down
6 changes: 3 additions & 3 deletions ci/travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ else
OS_NAME="linux"
OS_SHARED_LIB_EXT="so"
fi
OSQP_DEPLOY_DIR=osqp-0.2.0.dev1-${OS_NAME}64
OSQP_DEPLOY_DIR=osqp-0.2.0.dev2-${OS_NAME}64
mkdir $OSQP_DEPLOY_DIR/
mkdir $OSQP_DEPLOY_DIR/lib
mkdir $OSQP_DEPLOY_DIR/include
Expand All @@ -49,10 +49,10 @@ tar -czvf $OSQP_DEPLOY_DIR.tar.gz $OSQP_DEPLOY_DIR


# Deploy package
curl -T $OSQP_DEPLOY_DIR.tar.gz -ubstellato:$BINTRAY_API_KEY -H "X-Bintray-Package:OSQP" -H "X-Bintray-Version:0.2.0.dev1" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev1/
curl -T $OSQP_DEPLOY_DIR.tar.gz -ubstellato:$BINTRAY_API_KEY -H "X-Bintray-Package:OSQP" -H "X-Bintray-Version:0.2.0.dev2" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev2/

# Publish
curl -X POST -ubstellato:$BINTRAY_API_KEY https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev1/publish
curl -X POST -ubstellato:$BINTRAY_API_KEY https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev2/publish

fi

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# sys.path.insert(0, os.path.abspath('.'))

# Set version for bumpversion
__version__ = "0.2.0.dev1"
__version__ = "0.2.0.dev2"

# -- General configuration ------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen.conf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "OSQP"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 0.2.0.dev1
PROJECT_NUMBER = 0.2.0.dev2

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/matlab.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ To install the interface, just run the following commands:

.. code:: matlab
websave('install_osqp.m', 'https://dl.bintray.com/bstellato/generic/OSQP/0.2.0.dev1/install_osqp.m');
websave('install_osqp.m', 'https://dl.bintray.com/bstellato/generic/OSQP/0.2.0.dev2/install_osqp.m');
install_osqp
Expand Down
2 changes: 1 addition & 1 deletion include/constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extern "C" {
/*******************
* OSQP Versioning *
*******************/
#define OSQP_VERSION ("0.2.0.dev1") /* string literals automatically null-terminated */
#define OSQP_VERSION ("0.2.0.dev2") /* string literals automatically null-terminated */


/******************
Expand Down
2 changes: 1 addition & 1 deletion interfaces/matlab/osqp.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
classdef osqp < handle
% osqp interface class for OSQP solver v0.2.0.dev1
% osqp interface class for OSQP solver v0.2.0.dev2
% This class provides a complete interface to the C implementation
% of the OSQP solver.
%
Expand Down
2 changes: 1 addition & 1 deletion interfaces/matlab/package/install_osqp.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
end

fprintf('Downloading binaries...');
package_name = sprintf('https://dl.bintray.com/bstellato/generic/OSQP/0.2.0.dev1/osqp-0.2.0.dev1-matlab-%s64.tar.gz', platform);
package_name = sprintf('https://dl.bintray.com/bstellato/generic/OSQP/0.2.0.dev2/osqp-0.2.0.dev2-matlab-%s64.tar.gz', platform);
websave('osqp.tar.gz', package_name);
fprintf('\t\t\t\t[done]\n');

Expand Down
4 changes: 2 additions & 2 deletions interfaces/python/conda_recipe/osqp/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package:
name: osqp
version: "0.2.0.dev1"
version: "0.2.0.dev2"

source:
git_url: https://github.com/oxfordcontrol/osqp.git
git_tag: v0.2.0.dev1
git_tag: v0.2.0.dev2


# build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@


setup(name='PYTHON_EXT_NAME',
version='0.2.0.dev1',
version='0.2.0.dev2',
author='Bartolomeo Stellato, Goran Banjac',
author_email='bartolomeo.stellato@gmail.com',
description='This is the Python module for embedded OSQP: ' +
Expand Down
2 changes: 1 addition & 1 deletion interfaces/python/module/interface.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Python interface module for OSQP solver v0.2.0.dev1
Python interface module for OSQP solver v0.2.0.dev2
"""
from __future__ import print_function
from builtins import object
Expand Down
2 changes: 1 addition & 1 deletion interfaces/python/modulepurepy/_osqp.py
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ class OSQP(object):
work - workspace
"""
def __init__(self):
self._version = "0.2.0.dev1"
self._version = "0.2.0.dev2"

@property
def version(self):
Expand Down
2 changes: 1 addition & 1 deletion interfaces/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def build_extensions(self):
'osqppurepy']

setup(name='osqp',
version='0.2.0.dev1',
version='0.2.0.dev2',
author='Bartolomeo Stellato, Goran Banjac',
author_email='bartolomeo.stellato@gmail.com',
description='OSQP: The Operator Splitting QP Solver',
Expand Down

0 comments on commit c62fe67

Please sign in to comment.