Merge branch 'release/1.2.x' into cherrypick/1.2.x

cvxpy · Nov 22, 2022 · 8fc5154 · 8fc5154
2 parents e872ba3 + 7986993
commit 8fc5154
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/doc/source/tutorial/advanced/index.rst b/doc/source/tutorial/advanced/index.rst
@@ -405,7 +405,7 @@ parses and solves the problem.
         a non-DPP problem (instead of just a warning). Only relevant for
         problems involving Parameters. Defaults to ``False``.
    :type enforce_dpp: bool, optional
-   :param ignore_dpp : When True, DPP problems will be treated as non-DPP,
+   :param ignore_dpp: When True, DPP problems will be treated as non-DPP,
         which may speed up compilation. Defaults to False.
    :type ignore_dpp: bool, optional
    :param kwargs: Additional keyword arguments specifying solver specific options.

diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
 
 MAJOR = 1
 MINOR = 2
-MICRO = 2
+MICRO = 3
 IS_RELEASED = False
 IS_RELEASE_BRANCH = True
 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)