diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3bf9f5da8..31793c715 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.0.dev17 +current_version = 0.6.0 commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? serialize = diff --git a/.travis.yml b/.travis.yml index 622bc6f29..320cb436d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: sudo: required env: global: - - OSQP_VERSION="0.6.0.dev17" + - OSQP_VERSION="0.6.0" - DEPS_DIR="${HOME}/deps" # Bintray API key - secure: "RgZWa1zTkbXzbF+TW89CDa0OD+hjVrZCSnsG9X3OQRyMRcR8yp61SudC0sopJyAhrXA++6zRENI/T1rTmTr1WYcitF22x3fzVvPL+IQEUCxXPV6GOb3cBB/f3rxkpxeBYXO+tgsH1ad+A9T2oihO0/94fKVpZ5uN5mjJbP4yatF+DyEk5+IlHkp0yrgNxyLYEo7QCaDQJhffBJCa4R3C2sb2oL5S3JV6C1svWeSRVey5lrkNwk+rL1Af0kIEfWCXYBq5dchDLFGgfJlzFTw3i/UmKSqtdkq/Eq3vKpvvqMCHcm9ibcWeJX1iNSXVmblycLitI/K1LjONWvrAioHsv9qRaf+YXtLtyb1WXLmaPdi0P138TIDMHLslFYBq1Sf+1WZJ5U3KItzNXjFw/c2yUIDXMePrXNbHodYwND+3QS+yAoIHXT0buxUjjEbD6g54YfqjsTX8w510l+dy7WZQUM6GJn7byiEDfEEu9RbhLuDRHMG8h2viya9aLgIEAMq92/XbS6v01aX24dPmrlSZEocqwrp8yJxGU4tYk+gj4rnWXYF7XfaOVvINc5RRwejZ1mIkMg1fCEqaBmKQiOwDuypoG0L9kDaX85fGwo7/LIdApsJWZvXewlW8ZQERSqFwXDJpQXjS8iHcCzJUR+WUWkrVMYzzr74Fr+XeKmQeQC4=" diff --git a/README.md b/README.md index 5c8ba2269..076a3b2ac 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,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.6.0.dev17`. +The latest version is `0.6.0`. ## Citing OSQP diff --git a/appveyor.yml b/appveyor.yml index a6745b78d..78f6b5b04 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ environment: MINICONDA: C:\Miniconda CMAKE_PROJECT: MinGW Makefiles PYTHON_VERSION: 3.7 - OSQP_VERSION: 0.6.0.dev17 + OSQP_VERSION: 0.6.0 init: # Uncomment for remote desktop debug diff --git a/docs/conf.py b/docs/conf.py index 781e46b48..3e17fe6bd 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.6.0.dev17" +__version__ = "0.6.0" # -- General configuration ------------------------------------------------ diff --git a/docs/doxygen.conf b/docs/doxygen.conf index 0f5222748..40039199f 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.6.0.dev17 +PROJECT_NUMBER = 0.6.0 # 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/get_started/CC++.rst b/docs/get_started/CC++.rst index ef851409a..ab3eb7a1f 100644 --- a/docs/get_started/CC++.rst +++ b/docs/get_started/CC++.rst @@ -6,7 +6,7 @@ CC++ 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/libosqp.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/get_started/matlab.rst b/docs/get_started/matlab.rst index 33554e539..9b9efd4c3 100644 --- a/docs/get_started/matlab.rst +++ b/docs/get_started/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.6.0.dev17/install_osqp.m'); + websave('install_osqp.m', 'https://dl.bintray.com/bstellato/generic/OSQP/0.6.0/install_osqp.m'); install_osqp diff --git a/include/constants.h b/include/constants.h index a1fea5313..742403a30 100644 --- a/include/constants.h +++ b/include/constants.h @@ -9,7 +9,7 @@ extern "C" { /******************* * OSQP Versioning * *******************/ -# define OSQP_VERSION ("0.6.0.dev17") /* string literals automatically null-terminated +# define OSQP_VERSION ("0.6.0") /* string literals automatically null-terminated */ /******************