From f9505996e7801fe8acc0f52445a9d77c34f76780 Mon Sep 17 00:00:00 2001 From: David Adam Date: Wed, 16 Sep 2020 15:57:10 +0800 Subject: [PATCH] README/CHANGELOG: make Python requirements consistent [ci skip] --- CHANGELOG.rst | 4 ++-- README.rst | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9cf005925..385c9026b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -218,8 +218,8 @@ For distributors and developers builds with the system-installed PCRE2, or the version it bundles. By 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). +- Running the full interactive test suite now requires Python 3.5+ and the pexpect package (#6825); the expect package is no longer required. +- Support for Python 2 in fish's tools (``fish_config`` and the manual page completion generator) is no longer guaranteed. Please use Python 3.5 or later (#6537). -------------- diff --git a/README.rst b/README.rst index 31a914c4e..e813e2fc6 100644 --- a/README.rst +++ b/README.rst @@ -102,8 +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 3.3+ -- the ``fish_config`` web configuration tool requires Python 3.3+ and a web browser +- automated completion generation from manual pages requires Python 3.5+ +- the ``fish_config`` web configuration tool requires Python 3.5+ 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 @@ -155,7 +155,7 @@ Compiling fish requires: Sphinx is also optionally required to build the documentation from a cloned git repository. -Additionally, running the test suite requires python 3.3+ and the pexpect package. +Additionally, running the test suite requires Python 3.5+ and the pexpect package. Building from source (all platforms) - Makefile generator ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~