Merge d3aa5e3 into bf4a4ae

osqp · Jan 6, 2021 · dd6e18e · dd6e18e
2 parents bf4a4ae + d3aa5e3
commit dd6e18e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ env:
     - 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="
-    - PYTHON_VERSION="3.6"
+    - PYTHON_VERSION="3.8"
     # OSQP_DOCS_DEPLOY_EMAIL
     - secure: "EOnlXwP6GSEq4gm9lxTG6QHH4PUA2r2KOZULbdFXbn11Nr0z/ubjjzOGwGLCQdJcvz40G4Ks9Lty8RZqFvrIXXfMgli1jPR9N9jTPANog9abB+GOzjYn5IqBJMN4ZaR8DDpzHB4n9QE2w5I1ihTLIEnZ0Jxm9ckxYBlx9ndeRPEE0qqePkM1oP+GiT+WIidv9r9z3p6kKG+x4BF6d2SgzNGVL8v7yyPtVDGyUvLu/CGvY6pDgUqp0KImpOgjtrKTtFtYergBHTBPoLpxRLjw0RZRlaPquiitvwm4QxdYDmlyDahnoST330m0vvca2oCA76E3AlobUK8MDGxB+CiUfTM3e51mKCq3UO4o7g6BKT5ZF+0YpCFyfvvJZg6TupdfWdtlNG15rcgVgzOKAPrlaEe0qtCOUduPTHECCkOO/yUyEOU8+LEEvnESNdrJhfnPtkWBRJ607TjfKS6tLFcHjHobPtG4yB0ZBoOSWVjngIkJc/1vQNfrDXuBhWcF861GPnStv44ziNLl8+KL+9ekjPitVubInsxGNDtz0qVtMGigTK8xGxE0EjoUroIXc/DSfuFcPj4t7j56C7xFjxRz+nREGhq158XOiq0qLUtEdBPSvh9yxdn35n1L3D1kGM4oSHWhAslV55GZqorJfI/HBWelVhsVM+6HAoezQ9aJaQ4="
     # OSQP_DOCS_DEPLOY_GH_TOKEN

diff --git a/ci/travis/docs.sh b/ci/travis/docs.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 echo "Deploying docs to website osqp.org..."
 
@@ -45,3 +46,5 @@ if [[ $TRAVIS_OS_NAME == "linux" ]]; then
 	git push -q origin master
 
 fi
+
+set +e
diff --git a/docs/parsers/yalmip.rst b/docs/parsers/yalmip.rst
@@ -1,11 +1,11 @@
 YALMIP
 ======
 
-`YALMIP <https://yalmip.github.io/>`_ support the OSQP solver. You can easily define problems in high-level format and then specify OSQP by simply setting
+`YALMIP <https://yalmip.github.io/>`_ supports the OSQP solver. You can easily define problems in high-level format and then specify OSQP by simply setting
 
 .. code:: matlab
 
-   options = sdpsettings('solver','osqp', 'max_iter', 2000);
+   options = sdpsettings('solver', 'osqp', 'osqp.max_iter', 2000);
 
 
 where we set the :code:`max_iter` option to :code:`2000`.