From a22f9df684bbff1deb43f6e22d3154e74eed30a5 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Fri, 17 Aug 2018 22:25:13 +0900 Subject: [PATCH 1/3] Fix #5294: sphinx-quickstart blank prompts in PowerShell --- CHANGES | 1 + sphinx/cmd/quickstart.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index f3282e509..f03d1172c 100644 --- a/CHANGES +++ b/CHANGES @@ -32,6 +32,7 @@ Bugs fixed * #5211: autodoc: No docs generated for functools.partial functions * #5306: autodoc: ``getargspec()`` raises NameError for invalid typehints * #5298: imgmath: math_number_all causes equations to have two numbers in html +* #5294: sphinx-quickstart blank prompts in PowerShell Testing -------- diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py index 8b928b478..01b6ca3be 100644 --- a/sphinx/cmd/quickstart.py +++ b/sphinx/cmd/quickstart.py @@ -78,6 +78,12 @@ DEFAULTS = { PROMPT_PREFIX = '> ' +if sys.platform == 'win32': + # On Windows, show questions as bold because of color scheme of PowerShell (refs: #5294). + COLOR_QUESTION = 'bold' +else: + COLOR_QUESTION = 'purple' + # function to get input from terminal -- overridden by the test suite def term_input(prompt): @@ -189,7 +195,7 @@ def do_prompt(text, default=None, validator=nonempty): prompt = prompt.encode('utf-8') except UnicodeEncodeError: prompt = prompt.encode('latin1') - prompt = colorize('purple', prompt, input_mode=True) + prompt = colorize(COLOR_QUESTION, prompt, input_mode=True) x = term_input(prompt).strip() if default and not x: x = default From f9027c6daf716a6524d55786069963365c0ada90 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 19 Aug 2018 23:14:03 +0900 Subject: [PATCH 2/3] Bump to 1.7.7 final --- CHANGES | 19 ++----------------- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index f03d1172c..24295bdea 100644 --- a/CHANGES +++ b/CHANGES @@ -1,17 +1,5 @@ -Release 1.7.7 (in development) -============================== - -Dependencies ------------- - -Incompatible changes --------------------- - -Deprecated ----------- - -Features added --------------- +Release 1.7.7 (released Aug 19, 2018) +===================================== Bugs fixed ---------- @@ -34,9 +22,6 @@ Bugs fixed * #5298: imgmath: math_number_all causes equations to have two numbers in html * #5294: sphinx-quickstart blank prompts in PowerShell -Testing --------- - Release 1.7.6 (released Jul 17, 2018) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index bb0b8fe1e..9e32f6d38 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -31,13 +31,13 @@ if 'PYTHONWARNINGS' not in os.environ: warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '1.7.7+' +__version__ = '1.7.7' __released__ = '1.7.7' # used when Sphinx builds its own docs # version info for better programmatic use # possible values for 3rd element: 'alpha', 'beta', 'rc', 'final' # 'final' has 0 as the last element -version_info = (1, 7, 7, 'beta', 0) +version_info = (1, 7, 7, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From 23716142272aa3653943527a7bebec4da621abc4 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 19 Aug 2018 23:16:34 +0900 Subject: [PATCH 3/3] Bump version --- CHANGES | 21 +++++++++++++++++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 24295bdea..5f6bbaf8d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +Release 1.7.8 (in development) +============================== + +Dependencies +------------ + +Incompatible changes +-------------------- + +Deprecated +---------- + +Features added +-------------- + +Bugs fixed +---------- + +Testing +-------- + Release 1.7.7 (released Aug 19, 2018) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 9e32f6d38..7d63364ed 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -31,13 +31,13 @@ if 'PYTHONWARNINGS' not in os.environ: warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '1.7.7' -__released__ = '1.7.7' # used when Sphinx builds its own docs +__version__ = '1.7.8+' +__released__ = '1.7.8' # used when Sphinx builds its own docs # version info for better programmatic use # possible values for 3rd element: 'alpha', 'beta', 'rc', 'final' # 'final' has 0 as the last element -version_info = (1, 7, 7, 'final', 0) +version_info = (1, 7, 8, 'beta', 0) package_dir = path.abspath(path.dirname(__file__))