Skip to content

Commit 695da19

Browse files
authored
define the minimum supported Python version as 3.6 (danmar#7007)
1 parent 2a24e2a commit 695da19

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

.github/workflows/scriptcheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818
jobs:
1919
build:
2020

21-
# 'ubuntu-22.04' removes Python 3.5 and 3.6 so keep the previous LTS version
21+
# 'ubuntu-22.04' removes Python 3.6 so keep the previous LTS version
2222
runs-on: ubuntu-20.04
2323

2424
steps:
@@ -44,7 +44,7 @@ jobs:
4444
scriptcheck:
4545

4646
needs: build
47-
# 'ubuntu-22.04' removes Python 3.5 and 3.6 so keep the previous LTS version
47+
# 'ubuntu-22.04' removes Python 3.6 so keep the previous LTS version
4848
runs-on: ubuntu-20.04
4949
strategy:
5050
matrix:
@@ -101,7 +101,7 @@ jobs:
101101
if: matrix.python-latest
102102
run: |
103103
shopt -s globstar
104-
pylint --jobs $(nproc) addons/**/*.py htmlreport/cppcheck-htmlreport htmlreport/**/*.py test/**/*.py tools/**/*.py
104+
pylint --jobs $(nproc) --py-version 3.6 addons/**/*.py htmlreport/cppcheck-htmlreport htmlreport/**/*.py test/**/*.py tools/**/*.py
105105
106106
- name: check .json files
107107
if: matrix.python-latest

cmake/findDependencies.cmake

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,15 @@ else()
6464
endif()
6565
endif()
6666

67-
if(NOT Python_Interpreter_FOUND AND NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
68-
message(WARNING "No python interpreter found - disabling matchcompiler.")
69-
set(USE_MATCHCOMPILER_OPT "Off")
67+
if(NOT Python_Interpreter_FOUND)
68+
if(NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
69+
message(WARNING "No python interpreter found - disabling matchcompiler.")
70+
set(USE_MATCHCOMPILER_OPT "Off")
71+
endif()
72+
else()
73+
if(${Python_VERSION} VERSION_LESS 3.6)
74+
message(FATAL_ERROR "The minimum supported Python version is 3.6 - found ${Python_VERSION}")
75+
endif()
7076
endif()
7177

7278
if(NOT USE_BUNDLED_TINYXML2)

readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ There are multiple compilation choices:
4747
* GCC (g++)
4848
* Clang (clang++)
4949
50+
The minimum required Python version is 3.6.
51+
5052
### CMake
5153
5254
The minimum required version is CMake 3.5.

tools/donate-cpu.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@
125125
print('Unhandled argument: ' + arg)
126126
sys.exit(1)
127127

128-
if sys.version_info.major < 3 or (sys.version_info.major == 3 and sys.version_info.minor < 4):
128+
if sys.version_info.major < 3 or (sys.version_info.major == 3 and sys.version_info.minor < 6):
129129
print("#" * 80)
130130
print("IMPORTANT")
131-
print("Please run the client with at least Python 3.4, thanks!")
131+
print("Please run the client with at least Python 3.6, thanks!")
132132
print("#" * 80)
133133
time.sleep(2)
134134
sys.exit(1)

0 commit comments

Comments
 (0)