Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build NVDA with Python 3.8 32-bit #12042

Merged
merged 8 commits into from
Feb 15, 2021
Merged

Build NVDA with Python 3.8 32-bit #12042

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf127de
SConstruct: specify Pyhton 3.8.
josephsl Jan 31, 2021
fba70fa
SConstruct: remove Python 3.7.6 check.
josephsl Jan 31, 2021
096f61b
SConstruct: update copyright year
josephsl Jan 31, 2021
20ecf1f
SCons.bat: run SCons under Python 3.8 (32-bit).
josephsl Jan 31, 2021
c8cc1e8
Revert "SConstruct: update copyright year"
josephsl Feb 6, 2021
be1beca
scons.bat: update comment
josephsl Feb 6, 2021
6dfdfdf
Readme: mention Python 3.8.
michaelDCurran Feb 15, 2021
8e5bdaf
appveyor.yml: Instruct appveyor to use Python 3.8
michaelDCurran Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scons.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please upgrade this comment to mention Python 3.8

py -3.7-32 "%~dp0\scons.py" %*
py -3.8-32 "%~dp0\scons.py" %*
) else (
rem Python registers itself with the .py extension, so call scons.py.
"%~dp0\scons.py" %*
Expand Down
8 changes: 2 additions & 6 deletions sconstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# A part of NonVisual Desktop Access (NVDA)
# Copyright (C) 2010-2020 NV Access Limited, James Teh, Michael Curran, Peter Vágner, Joseph Lee, Reef Turner, Babbage B.V., Leonard de Ruijter, Łukasz Golonka, Accessolutions, Julien Cochuyt # noqa: E501
# Copyright (C) 2010-2021 NV Access Limited, James Teh, Michael Curran, Peter Vágner, Joseph Lee, Reef Turner, Babbage B.V., Leonard de Ruijter, Łukasz Golonka, Accessolutions, Julien Cochuyt # noqa: E501
# This file may be used under the terms of the GNU General Public License, version 2 or later.
# For more details see: https://www.gnu.org/licenses/gpl-2.0.html

Expand All @@ -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)
Expand All @@ -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
Expand Down