diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d9bc1d09a..c82105c7b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -215,6 +215,7 @@ For distributors and developers default it prefers the system library if available, unless Mac codesigning is enabled (#6952). - Running the full interactive test suite now requires Python 3.3+ and the pexpect package (#6825). +- For fish's tools written in python, like fish_config and the manpage completion generator, support for python 2 has been dropped. Please use Python 3.5 or later (#6537). -------------- diff --git a/README.rst b/README.rst index df14e6eaf..31a914c4e 100644 --- a/README.rst +++ b/README.rst @@ -102,11 +102,8 @@ The following optional features also have specific requirements: - builtin commands that have the ``--help`` option or print usage messages require ``ul`` and either ``nroff`` or ``mandoc`` for display -- automated completion generation from manual pages requires Python - (2.7+ or 3.3+) and possibly the ``backports.lzma`` module for Python - 2.7 -- the ``fish_config`` web configuration tool requires Python (2.7+ or - 3.3 +) and a web browser +- automated completion generation from manual pages requires Python 3.3+ +- the ``fish_config`` web configuration tool requires Python 3.3+ and a web browser - system clipboard integration (with the default Ctrl-V and Ctrl-X bindings) require either the ``xsel``, ``xclip``, ``wl-copy``/``wl-paste`` or ``pbcopy``/``pbpaste`` utilities