diff options
| -rwxr-xr-x | ci/before_install.sh | 2 | ||||
| -rwxr-xr-x | scripts/gen_vimdoc.py | 6 | ||||
| -rw-r--r-- | third-party/cmake/BuildLibvterm.cmake | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/ci/before_install.sh b/ci/before_install.sh index 0303936bdd..1cf60edf73 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -22,7 +22,7 @@ if [[ "${TRAVIS_OS_NAME}" != osx ]] && command -v pyenv; then echo 'Setting Python versions via pyenv' # Prefer Python 2 over 3 (more conservative). - pyenv global 2.7.15:3.7 + pyenv global 2.7.15:3.7.1 echo 'Updated Python info:' ( diff --git a/scripts/gen_vimdoc.py b/scripts/gen_vimdoc.py index 328a903b46..a61690e99f 100755 --- a/scripts/gen_vimdoc.py +++ b/scripts/gen_vimdoc.py @@ -50,8 +50,10 @@ import msgpack from xml.dom import minidom -if sys.version_info[0] < 3 or sys.version_info[1] < 5: - print("requires Python 3.5+") +MIN_PYTHON_VERSION = (3, 5) + +if sys.version_info < MIN_PYTHON_VERSION: + print("requires Python {}.{}+".format(*MIN_PYTHON_VERSION)) sys.exit(1) DEBUG = ('DEBUG' in os.environ) diff --git a/third-party/cmake/BuildLibvterm.cmake b/third-party/cmake/BuildLibvterm.cmake index 61c1c90fa6..c3485dac25 100644 --- a/third-party/cmake/BuildLibvterm.cmake +++ b/third-party/cmake/BuildLibvterm.cmake @@ -27,7 +27,6 @@ function(BuildLibvterm) -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake PATCH_COMMAND "${_libvterm_PATCH_COMMAND}" - CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 CONFIGURE_COMMAND "${_libvterm_CONFIGURE_COMMAND}" BUILD_COMMAND "${_libvterm_BUILD_COMMAND}" |