Skip to content

Commit 8ae9d31

Browse files
committed
Bump minimum python version to 3.6
1 parent 7e37329 commit 8ae9d31

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.python-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.5.6
1+
3.6.12

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
env:
5858
cache: pip
5959
language: python
60-
python: '3.5' # Oldest supported version according to doc/dependencies.md
60+
python: '3.6' # Oldest supported version according to doc/dependencies.md
6161
install:
6262
- set -o errexit; source ./ci/lint/04_install.sh
6363
before_script:
@@ -83,7 +83,7 @@ jobs:
8383
FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
8484
8585
- stage: test
86-
name: 'x86_64 Linux [GOAL: install] [xenial] [no wallet]'
86+
name: 'x86_64 Linux [GOAL: install] [bionic] [no wallet]'
8787
env: >-
8888
FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh"
8989

ci/test/00_setup_env_native_nowallet.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_nowallet
10-
export DOCKER_NAME_TAG=ubuntu:16.04 # Use xenial to have one config run the tests in python3.5, see doc/dependencies.md
11-
export PACKAGES="python3-zmq clang-3.8 llvm-3.8" # Use clang-3.8 to test C++11 compatibility, see doc/dependencies.md
10+
export DOCKER_NAME_TAG=ubuntu:18.04 # Use bionic to have one config run the tests in python3.6, see doc/dependencies.md (3.6 is not available in xenial/16.04)
11+
export PACKAGES="python3-zmq clang-3.9 llvm-3.9" # Use clang-3.9 to test C++11 compatibility, see doc/dependencies.md (3.8 is not available in bionic)
1212
export DEP_OPTS="NO_WALLET=1"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CC=clang-3.8 CXX=clang++-3.8 --with-boost-process"
14+
export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CC=clang-3.9 CXX=clang++-3.9 --with-boost-process"

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ AC_PATH_TOOL(STRIP, strip)
107107
AC_PATH_TOOL(GCOV, gcov)
108108
AC_PATH_TOOL(LLVM_COV, llvm-cov)
109109
AC_PATH_PROG(LCOV, lcov)
110-
dnl Python 3.5 is specified in .python-version and should be used if available, see doc/dependencies.md
111-
AC_PATH_PROGS([PYTHON], [python3.5 python3.6 python3.7 python3.8 python3 python])
110+
dnl Python 3.6 is specified in .python-version and should be used if available, see doc/dependencies.md
111+
AC_PATH_PROGS([PYTHON], [python3.6 python3.7 python3.8 python3.9 python3 python])
112112
AC_PATH_PROG(GENHTML, genhtml)
113113
AC_PATH_PROG([GIT], [git])
114114
AC_PATH_PROG(CCACHE,ccache)

doc/dependencies.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
1818
| librsvg | | | | | |
1919
| MiniUPnPc | [2.0.20180203](https://miniupnp.tuxfamily.org/files) | | No | | |
2020
| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) |
21-
| Python (tests) | | [3.5](https://www.python.org/downloads) | | | |
21+
| Python (tests) | | [3.6](https://www.python.org/downloads) | | | |
2222
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
2323
| Qt | [5.9.8](https://download.qt.io/official_releases/qt/) | [5.5.1](https://github.com/bitcoin/bitcoin/issues/13478) | No | | |
2424
| SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | | | |

0 commit comments

Comments
 (0)