diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 27ad4ebdb..1cb55cccb 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.0.dev9 +current_version = 0.2.0.dev10 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? diff --git a/README.md b/README.md index 5ac0adf19..e935567d8 100644 --- a/README.md +++ b/README.md @@ -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.dev9`. +The latest version is `0.2.0.dev10`.
diff --git a/ci/appveyor/deploy.cmd b/ci/appveyor/deploy.cmd index 513056c31..a7f0336fd 100644 --- a/ci/appveyor/deploy.cmd +++ b/ci/appveyor/deploy.cmd @@ -18,9 +18,9 @@ IF "%PYTHON_VERSION%" == "3.6" ( cd %APPVEYOR_BUILD_FOLDER%\build\out IF "%PLATFORM%" == "x86" ( - set "OSQP_DEPLOY_DIR=osqp-0.2.0.dev9-windows32" + set "OSQP_DEPLOY_DIR=osqp-0.2.0.dev10-windows32" ) ELSE ( - set "OSQP_DEPLOY_DIR=osqp-0.2.0.dev9-windows64" + set "OSQP_DEPLOY_DIR=osqp-0.2.0.dev10-windows64" ) REM Create directories REM NB. We force expansion of the variable at execution time! @@ -45,11 +45,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.dev9" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev9/ + curl -T !OSQP_DEPLOY_DIR!.tar.gz -ubstellato:%BINTRAY_API_KEY% -H "X-Bintray-Package:OSQP" -H "X-Bintray-Version:0.2.0.dev10" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev10/ 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.dev9/publish + curl -X POST -ubstellato:%BINTRAY_API_KEY% https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev10/publish if errorlevel 1 exit /b 1 ) diff --git a/ci/travis/deploy.sh b/ci/travis/deploy.sh index 82a8a9641..bcc966b23 100644 --- a/ci/travis/deploy.sh +++ b/ci/travis/deploy.sh @@ -34,7 +34,7 @@ else OS_NAME="linux" OS_SHARED_LIB_EXT="so" fi -OSQP_DEPLOY_DIR=osqp-0.2.0.dev9-${OS_NAME}64 +OSQP_DEPLOY_DIR=osqp-0.2.0.dev10-${OS_NAME}64 mkdir $OSQP_DEPLOY_DIR/ mkdir $OSQP_DEPLOY_DIR/lib mkdir $OSQP_DEPLOY_DIR/include @@ -51,10 +51,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.dev9" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev9/ +curl -T $OSQP_DEPLOY_DIR.tar.gz -ubstellato:$BINTRAY_API_KEY -H "X-Bintray-Package:OSQP" -H "X-Bintray-Version:0.2.0.dev10" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev10/ # Publish -curl -X POST -ubstellato:$BINTRAY_API_KEY https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev9/publish +curl -X POST -ubstellato:$BINTRAY_API_KEY https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev10/publish fi diff --git a/docs/conf.py b/docs/conf.py index 135badff5..153e09472 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,7 +24,7 @@ # sys.path.insert(0, os.path.abspath('.')) # Set version for bumpversion -__version__ = "0.2.0.dev9" +__version__ = "0.2.0.dev10" # -- General configuration ------------------------------------------------ diff --git a/docs/doxygen.conf b/docs/doxygen.conf index e2430a949..e752d8bf1 100644 --- a/docs/doxygen.conf +++ b/docs/doxygen.conf @@ -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.dev9 +PROJECT_NUMBER = 0.2.0.dev10 # 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 diff --git a/docs/installation/CC++.rst b/docs/installation/CC++.rst index a5cf9d614..7b2be920a 100644 --- a/docs/installation/CC++.rst +++ b/docs/installation/CC++.rst @@ -6,7 +6,7 @@ CC++ interface Binaries -------- -Precompiled platform-dependent shared and static libraries are available on `Bintray `_. +Precompiled platform-dependent shared and static libraries are available on `Bintray `_. We here assume that the user uncompressed each archive to :code:`OSQP_FOLDER`. Each archive contains static :code:`OSQP_FOLDER/lib/libosqpstatic.a` and shared :code:`OSQP_FOLER/lib/libosqp.ext` libraries to be used to interface OSQP to any C/C++ software. diff --git a/docs/installation/matlab.rst b/docs/installation/matlab.rst index 9ce28ba62..a64df9502 100644 --- a/docs/installation/matlab.rst +++ b/docs/installation/matlab.rst @@ -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.dev9/install_osqp.m'); + websave('install_osqp.m', 'https://dl.bintray.com/bstellato/generic/OSQP/0.2.0.dev10/install_osqp.m'); install_osqp diff --git a/include/constants.h b/include/constants.h index 57bb97807..15e16a3af 100644 --- a/include/constants.h +++ b/include/constants.h @@ -9,7 +9,7 @@ extern "C" { /******************* * OSQP Versioning * *******************/ -#define OSQP_VERSION ("0.2.0.dev9") /* string literals automatically null-terminated */ +#define OSQP_VERSION ("0.2.0.dev10") /* string literals automatically null-terminated */ /****************** diff --git a/interfaces/matlab/osqp.m b/interfaces/matlab/osqp.m index ff9db6d9a..cfd471be8 100755 --- a/interfaces/matlab/osqp.m +++ b/interfaces/matlab/osqp.m @@ -1,5 +1,5 @@ classdef osqp < handle - % osqp interface class for OSQP solver v0.2.0.dev9 + % osqp interface class for OSQP solver v0.2.0.dev10 % This class provides a complete interface to the C implementation % of the OSQP solver. % diff --git a/interfaces/matlab/package/install_osqp.m b/interfaces/matlab/package/install_osqp.m index cb0c2df7b..9569a6371 100644 --- a/interfaces/matlab/package/install_osqp.m +++ b/interfaces/matlab/package/install_osqp.m @@ -11,7 +11,7 @@ end fprintf('Downloading binaries...'); - package_name = sprintf('https://dl.bintray.com/bstellato/generic/OSQP/0.2.0.dev9/osqp-0.2.0.dev9-matlab-%s64.tar.gz', platform); + package_name = sprintf('https://dl.bintray.com/bstellato/generic/OSQP/0.2.0.dev10/osqp-0.2.0.dev10-matlab-%s64.tar.gz', platform); websave('osqp.tar.gz', package_name); fprintf('\t\t\t\t[done]\n'); diff --git a/interfaces/python/conda_recipe/osqp/meta.yaml b/interfaces/python/conda_recipe/osqp/meta.yaml index 0b3cf0a67..6a9839f21 100644 --- a/interfaces/python/conda_recipe/osqp/meta.yaml +++ b/interfaces/python/conda_recipe/osqp/meta.yaml @@ -1,10 +1,10 @@ package: name: osqp - version: "0.2.0.dev9" + version: "0.2.0.dev10" source: git_url: https://github.com/oxfordcontrol/osqp.git - git_tag: v0.2.0.dev9 + git_tag: v0.2.0.dev10 # build: diff --git a/interfaces/python/module/codegen/files_to_generate/setup.py b/interfaces/python/module/codegen/files_to_generate/setup.py index ea3278178..91d940ce7 100644 --- a/interfaces/python/module/codegen/files_to_generate/setup.py +++ b/interfaces/python/module/codegen/files_to_generate/setup.py @@ -64,7 +64,7 @@ setup(name='PYTHON_EXT_NAME', - version='0.2.0.dev9', + version='0.2.0.dev10', author='Bartolomeo Stellato, Goran Banjac', author_email='bartolomeo.stellato@gmail.com', description='This is the Python module for embedded OSQP: ' + diff --git a/interfaces/python/module/interface.py b/interfaces/python/module/interface.py index a1d24de18..dfea6f24a 100644 --- a/interfaces/python/module/interface.py +++ b/interfaces/python/module/interface.py @@ -1,5 +1,5 @@ """ -Python interface module for OSQP solver v0.2.0.dev9 +Python interface module for OSQP solver v0.2.0.dev10 """ from __future__ import print_function from builtins import object diff --git a/interfaces/python/modulepurepy/_osqp.py b/interfaces/python/modulepurepy/_osqp.py index 1d671b4a4..f208836cd 100644 --- a/interfaces/python/modulepurepy/_osqp.py +++ b/interfaces/python/modulepurepy/_osqp.py @@ -327,7 +327,7 @@ class OSQP(object): work - workspace """ def __init__(self): - self._version = "0.2.0.dev9" + self._version = "0.2.0.dev10" @property def version(self): diff --git a/interfaces/python/setup.py b/interfaces/python/setup.py index c8cf36483..e6da212ce 100644 --- a/interfaces/python/setup.py +++ b/interfaces/python/setup.py @@ -159,7 +159,7 @@ def build_extensions(self): 'osqppurepy'] setup(name='osqp', - version='0.2.0.dev9', + version='0.2.0.dev10', author='Bartolomeo Stellato, Goran Banjac', author_email='bartolomeo.stellato@gmail.com', description='OSQP: The Operator Splitting QP Solver',