diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-06-22 10:15:31 -0400 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2022-06-22 09:13:05 -0700 |
commit | 1a3d29dd0e535dc18039e270e47a2ba2f9c9d3a3 (patch) | |
tree | acb8696a80e0dd7e5e4e76d5961aeaf777bdb858 | |
parent | b05d7db44359c4e5bf7816d68e8bb556fd1e4724 (diff) | |
download | meson-1a3d29dd0e535dc18039e270e47a2ba2f9c9d3a3.zip meson-1a3d29dd0e535dc18039e270e47a2ba2f9c9d3a3.tar.gz meson-1a3d29dd0e535dc18039e270e47a2ba2f9c9d3a3.tar.bz2 |
Move python version check as first thing
-rwxr-xr-x | meson.py | 9 | ||||
-rw-r--r-- | mesonbuild/mesonmain.py | 6 |
2 files changed, 9 insertions, 6 deletions
@@ -15,6 +15,15 @@ # limitations under the License. import sys + +# Check python version before importing anything else, we might have an older +# Python that would error on f-string syntax for example. +if sys.version_info < (3, 7): + print('Meson works correctly only with python 3.7+.') + print('You have python {}.'.format(sys.version)) + print('Please update your environment') + sys.exit(1) + from pathlib import Path # If we're run uninstalled, add the script directory to sys.path to ensure that diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 5e8cebd..4ca4a96 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -209,12 +209,6 @@ def ensure_stdout_accepts_unicode(): sys.stdout.reconfigure(errors='surrogateescape') def run(original_args, mainfile): - if sys.version_info < (3, 7): - print('Meson works correctly only with python 3.7+.') - print(f'You have python {sys.version}.') - print('Please update your environment') - return 1 - if sys.version_info >= (3, 10) and os.environ.get('MESON_RUNNING_IN_PROJECT_TESTS'): # workaround for https://bugs.python.org/issue34624 import warnings |