Skip to content

Commit

Permalink
Merge branch '7.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
davidism committed Oct 18, 2019
2 parents 11abf2b + 6245807 commit 6944450
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Unreleased
- Fix output on Windows Python 2.7 built with MSVC 14. :pr:`1342`
- Always return of of the passed choices for ``click.Choice``
:issue:`1277`, :pr:`1318`
- Fix ``OSError`` when running in MSYS2. :issue:`1338`


Version 7.0
Expand Down
3 changes: 2 additions & 1 deletion click/_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

PY2 = sys.version_info[0] == 2
CYGWIN = sys.platform.startswith('cygwin')
MSYS2 = sys.platform.startswith('win') and ('GCC' in sys.version)
# Determine local App Engine environment, per Google's own suggestion
APP_ENGINE = ('APPENGINE_RUNTIME' in os.environ and
'Development/' in os.environ['SERVER_SOFTWARE'])
WIN = sys.platform.startswith('win') and not APP_ENGINE
WIN = sys.platform.startswith('win') and not APP_ENGINE and not MSYS2
DEFAULT_COLUMNS = 80


Expand Down
4 changes: 4 additions & 0 deletions docs/options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,10 @@ What it looks like:
Choices should be unique after considering the effects of
``case_sensitive`` and any specified token normalization function.

.. versionchanged:: 7.1
The resulting value from an option will always be on the of the
originally passed choices regardless of ``case_sensitive``.

.. _option-prompting:

Prompting
Expand Down

0 comments on commit 6944450

Please sign in to comment.