diff --git a/appveyor.yml b/appveyor.yml index 364c5d87591..90c6b2bd54a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ branches: - /release-.*/ environment: - PY_PYTHON: 3.7-32 + PY_PYTHON: 3.8-32 encFileKey: secure: ekOvuyywHuDdGZmRmoj+b3jfrq39A2xlx4RD5ZUGd/8= mozillaSymsAuthToken: diff --git a/readme.md b/readme.md index 61910f12878..2b96dc2f65a 100644 --- a/readme.md +++ b/readme.md @@ -55,9 +55,8 @@ The NVDA source depends on several other packages to run correctly. ### Installed Dependencies The following dependencies need to be installed on your system: -* [Python](https://www.python.org/), version 3.7, 32 bit +* [Python](https://www.python.org/), version 3.8, 32 bit * Use latest minor version if possible. - * Don't use `3.7.6` it causes an error while building, see #10696. * Microsoft Visual Studio 2019 Community, Version 16.3 or later: * Download from https://visualstudio.microsoft.com/vs/ * When installing Visual Studio, you need to enable the following: diff --git a/scons.bat b/scons.bat index 5c7001358e6..6c9c8603047 100644 --- a/scons.bat +++ b/scons.bat @@ -5,8 +5,8 @@ rem Instead, find the python launcher (installed by python 3) where py 1>nul 2>&1 if "%ERRORLEVEL%" == "0" ( rem Python launcher is present in the PATH - rem Call python 3.7 for 32 bits - py -3.7-32 "%~dp0\scons.py" %* + rem Call python 3.8 32-bit + py -3.8-32 "%~dp0\scons.py" %* ) else ( rem Python registers itself with the .py extension, so call scons.py. "%~dp0\scons.py" %* diff --git a/sconstruct b/sconstruct index 2824c19d335..c4df9c236cf 100755 --- a/sconstruct +++ b/sconstruct @@ -9,7 +9,7 @@ import platform # Variables for storing required version of Python, and the version which is used to run this script. requiredPythonMajor ="3" -requiredPythonMinor = "7" +requiredPythonMinor = "8" requiredPythonArchitecture = "32bit" installedPythonMajor = str(sys.version_info.major) installedPythonMinor = str(sys.version_info.minor) @@ -34,10 +34,6 @@ if ( requiredPythonArchitecture ) ) -if sys.version_info.micro == 6: - # #10696: Building with Python 3.7.6 fails. Innform user and exit. - Py376FailMsg = "Building with Python 3.7.6 is not possible.\nPlease use more recent version of Python 3." - raise RuntimeError(Py376FailMsg) sourceEnvPath = os.path.abspath(os.path.join(Dir('.').srcnode().path, "source")) sys.path.append(sourceEnvPath) import sourceEnv