diff options
| author | Sjors Provoost <sjors@sprovoost.nl> | 2018-12-06 15:38:57 +0100 |
|---|---|---|
| committer | Sjors Provoost <sjors@sprovoost.nl> | 2018-12-12 10:39:32 +0100 |
| commit | 74ce32683199b987e45eb16f0320ae392ff10edc (patch) | |
| tree | 563736b248986a5cf50e867fea24495e32159f69 | |
| parent | ed2a2cebd36280be0b5e585a8c3c901c15e52f87 (diff) | |
| download | bitcoin-74ce32683199b987e45eb16f0320ae392ff10edc.tar.xz | |
[test] Travis: enforce Python 3.4 support in functional tests
Make lint/check-doc.py Python 3.4 compatible.
Also add .python-version for pyenv which will cause tests with too
modern syntax to fail on developer machine rather than on Travis.
| -rw-r--r-- | .python-version | 1 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | test/lint/check-doc.py | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.python-version b/.python-version new file mode 100644 index 0000000000..7bcbb3808b --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.4.9 diff --git a/.travis.yml b/.travis.yml index dec517f0a2..4f57c6f6ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ jobs: env: cache: false language: python - python: '3.6' + python: '3.4' # Oldest supported version according to doc/dependencies.md install: - set -o errexit; source .travis/lint_04_install.sh before_script: diff --git a/test/lint/check-doc.py b/test/lint/check-doc.py index b0d9f87958..4facd6c334 100755 --- a/test/lint/check-doc.py +++ b/test/lint/check-doc.py @@ -26,8 +26,12 @@ SET_DOC_OPTIONAL = set(['-h', '-help', '-dbcrashratio', '-forcecompactdb']) def main(): - used = check_output(CMD_GREP_ARGS, shell=True, universal_newlines=True, encoding='utf8') - docd = check_output(CMD_GREP_DOCS, shell=True, universal_newlines=True, encoding='utf8') + if sys.version_info >= (3, 6): + used = check_output(CMD_GREP_ARGS, shell=True, universal_newlines=True, encoding='utf8') + docd = check_output(CMD_GREP_DOCS, shell=True, universal_newlines=True, encoding='utf8') + else: + used = check_output(CMD_GREP_ARGS, shell=True, universal_newlines=True) # encoding='utf8' + docd = check_output(CMD_GREP_DOCS, shell=True, universal_newlines=True) # encoding='utf8' args_used = set(re.findall(re.compile(REGEX_ARG), used)) args_docd = set(re.findall(re.compile(REGEX_DOC), docd)).union(SET_DOC_OPTIONAL) |