Update to Python 3.11

appveyor.yml

@@ -20,7 +20,7 @@ init:
       "INIT, $(Get-Date -Format 'o')"| Out-File ../timing.csv -Append
 
 environment:
- PY_PYTHON: 3.7-32
+ PY_PYTHON: 3.11-32
  secure_authenticode_pass:
   secure: Way+hJyhbiLG/cmCo4+dHHzS5DiSvk/45o6frnIQ27GBX6nVDsh7jwQ7fSnqxBRP
  secure_ssh_pass:

nvdaHelper/readme.md

@@ -70,7 +70,7 @@ You should still build on the command line to verify errors.
   - Press next
 -  Specify Debug Configuration Settings
   - Build command line: `scons source`
-  - Preprocessor definitions (/D): `WIN32;_WINDOWS;_USRDLL;NVDAHELPER_EXPORTS;UNICODE;_CRT_SECURE_NO_DEPRECATE;LOGLEVEL=15;_WIN32_WINNT=_WIN32_WINNT_WIN7;NOMINMAX`
+  - Preprocessor definitions (/D): `WIN32;_WINDOWS;_USRDLL;NVDAHELPER_EXPORTS;UNICODE;_CRT_SECURE_NO_DEPRECATE;LOGLEVEL=15;_WIN32_WINNT=_WIN32_WINNT_WINBLUE;NOMINMAX`
   - Include search paths (/I): `../include;../miscDeps/include;./;../build\x86_64;../include/minhook/include`
   - Forced Included files (/FI): `winuser.h`
   - Press next
@@ -90,7 +90,7 @@ You should still build on the command line to verify errors.
   ```
   cl /Fobuild\x86\vbufBackends\gecko_ia2\gecko_ia2.obj /c build\x86\vbufBackends\gecko_ia2\gecko_ia2.cpp
   /TP /EHsc /nologo /std:c++20 /permissive- /Od /MT /W3 /WX
-  /DUNICODE /D_CRT_SECURE_NO_DEPRECATE /DLOGLEVEL=15 /D_WIN32_WINNT=_WIN32_WINNT_WIN7 /DNOMINMAX /DNDEBUG
+  /DUNICODE /D_CRT_SECURE_NO_DEPRECATE /DLOGLEVEL=15 /D_WIN32_WINNT=_WIN32_WINNT_WINBLUE /DNOMINMAX /DNDEBUG
   /Iinclude /Imiscdeps\include /Ibuild\x86
   /Z7
   ```

projectDocs/dev/createDevEnvironment.md

@@ -34,7 +34,7 @@ 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.11, 32 bit
 	* Use latest minor version if possible.
 * Microsoft Visual Studio 2019 or 2022:
 	* To replicate the production build environment, use the [version of Visual Studio 2019 that AppVeyor is using](https://www.appveyor.com/docs/windows-images-software/#visual-studio-2019). 

requirements.txt

@@ -4,28 +4,21 @@ SCons==4.5.2
 # NVDA's runtime dependencies
 comtypes==1.2.0
 pyserial==3.5
-wxPython==4.1.1
-git+https://github.com/DiffSK/configobj@3e2f4cc#egg=configobj
+wxPython==4.2.1
+configobj==5.0.8
 requests==2.31.0
-# Required to use a pinned old version for requests.
-# py2exe fails to compile properly without this.
-# This can be removed when upgrading py2exe to 0.13+ and python to 3.8+.
-# https://github.com/Ousret/charset_normalizer/issues/253
-charset-normalizer==2.1.1
+# Pillow is an implicit dependency and requires zlib and jpeg by default, but we don't need it
+Pillow==10.0.1 -C "zlib=disable" -C "jpeg=disable"
 
 #NVDA_DMP requires diff-match-patch
 fast_diff_match_patch==2.0.1
 
 # Packaging NVDA
-py2exe==0.11.1.0
+py2exe==0.13.0.0
 
 # For building developer documentation
-sphinx==5.1.1
-sphinx_rtd_theme==1.0.0
-
-# Requirements for type checking.
-# typing_extensions is incorporated in py3.8+, also available via mypy
-typing_extensions==4.3.0
+sphinx==7.2.6
+sphinx_rtd_theme==1.3.0
 
 # Requirements for automated linting
 flake8 ~= 3.7.7
@@ -35,6 +28,6 @@ flake8-tabs == 2.1.0
 nose==1.3.7
 
 # Requirements for system tests
-robotframework==3.2.2
-robotremoteserver==1.1
-robotframework-screencaplibrary==1.5.0
+robotframework==6.1.1
+robotremoteserver==1.1.1
+robotframework-screencaplibrary==1.6.0

sconstruct

@@ -23,8 +23,8 @@ if nvdaVenv != virtualEnv:
 	print("Warning: SCons launched within a custom Python virtual environment.")
 
 # Variables for storing required version of Python, and the version which is used to run this script.
-requiredPythonMajor ="3"
-requiredPythonMinor = "7"
+requiredPythonMajor = "3"
+requiredPythonMinor = "11"
 requiredPythonArchitecture = "32bit"
 installedPythonMajor = str(sys.version_info.major)
 installedPythonMinor = str(sys.version_info.minor)

source/UIAHandler/types.py

@@ -5,8 +5,6 @@
 
 from typing import (
 	List,
-)
-from typing_extensions import (
 	Protocol,
 )
 

source/_addonStore/models/addon.py

@@ -17,10 +17,8 @@
 	Generator,
 	List,
 	Optional,
-	Union,
-)
-from typing_extensions import (
 	Protocol,
+	Union,
 )
 
 from requests.structures import CaseInsensitiveDict

source/_addonStore/models/status.py

@@ -10,12 +10,10 @@
 	Dict,
 	Optional,
 	OrderedDict,
+	Protocol,
 	Set,
 	TYPE_CHECKING,
 )
-from typing_extensions import (
-	Protocol,
-)
 
 import globalVars
 from logHandler import log

source/_addonStore/models/version.py

@@ -7,8 +7,8 @@
 from typing import (
 	NamedTuple,
 	Optional,
+	Protocol,
 )
-from typing_extensions import Protocol  # Python 3.8 adds native support
 import addonAPIVersion
 
 

source/config/aggregatedSection.py

@@ -5,9 +5,9 @@
 
 from typing import (
 	Dict,
+	Protocol,
 	Union,
 )
-from typing_extensions import Protocol
 
 
 class _SupportsStrT(Protocol):

source/config/featureFlagEnums.py

@@ -12,16 +12,13 @@
 """
 import enum
 import typing
+from typing import Protocol
 
 from utils.displayString import (
 	DisplayStringEnum,
 	_DisplayStringEnumMixin,
 )
 
-from typing_extensions import (
-	Protocol,  # Python 3.8 adds native support
-)
-
 
 class FeatureFlagEnumProtocol(Protocol):
 	""" All feature flags are expected to have a "DEFAULT" value.

source/globalVars.py

@@ -26,9 +26,9 @@
 from typing import (
 	TYPE_CHECKING,
 	List,
+	Literal,
 	Optional,
 )
-from typing_extensions import Literal
 
 if TYPE_CHECKING:
 	import documentBase  # noqa: F401 used for type checking only

source/louisHelper.py

@@ -1,14 +1,18 @@
-# louisHelper.py
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2018 NV Access Limited, Babbage B.V.
+# Copyright (C) 2018-2023 NV Access Limited, Babbage B.V.
 
 """Helper module to ease communication to and from liblouis."""
 
-import louis
-from logHandler import log
 import config
+from logHandler import log
+import globalVars
+import os
+
+with os.add_dll_directory(globalVars.appDir):
+	import louis
+
 
 LOUIS_TO_NVDA_LOG_LEVELS = {
 	louis.LOG_ALL: log.DEBUG,

user_docs/en/changes.t2t

@@ -28,9 +28,17 @@ Please refer to [the developer guide https://www.nvaccess.org/files/nvda/documen
 
 - Note: this is an Add-on API compatibility breaking release.
 Add-ons will need to be re-tested and have their manifest updated.
-- Updated Comtypes to version 1.2.0. (#15513)
-- Updated fast_diff_match_patch to version 2.0.1. (#15514)
-- Updated SCons to version 4.5.2. (#15529)
+- NVDA is now built with Python 3.11 (#12064)
+- Updated pip dependencies:
+  - configobj to 5.0.8. (#15544)
+  - Comtypes to 1.2.0. (#15513)
+  - fast_diff_match_patch to 2.0.1. (#15514)
+  - py2exe to 0.13.0.0. (#15544) 
+  - robotframework to 6.1.1. (#15544)
+  - SCons to 4.5.2. (#15529)
+  - sphinx to 7.2.6. (#15544)
+  - wxPython to 4.2.1 (#12551)
+  -
 - Added extension point: ``treeInterceptorHandler.post_browseModeStateChange``. (#14969)
 -
 

user_docs/en/userGuide.t2t

@@ -39,9 +39,7 @@ Major highlights include:
 -
 
 ++ System Requirements ++[SystemRequirements]
-- Operating Systems: all 32-bit and 64-bit editions of Windows 7, Windows 8, Windows 8.1, Windows 10, Windows 11, and all Server Operating Systems starting from Windows Server 2008 R2.
-  - For Windows 7, NVDA requires Service Pack 1 or higher.
-  - For Windows Server 2008 R2, NVDA requires Service Pack 1 or higher.
+- Operating Systems: all 32-bit and 64-bit editions of Windows 8.1, Windows 10, Windows 11, and all Server Operating Systems starting from Windows Server 2012.
   - both AMD64 and ARM64 variants of Windows are supported.
   -
 - at least 150 MB of storage space.
@@ -2935,7 +2933,7 @@ For an even more extensive list of  free and commercial synthesizers that you ca
 
 ++ eSpeak NG ++[eSpeakNG]
 The [eSpeak NG https://github.com/espeak-ng/espeak-ng] synthesizer is built directly into NVDA and does not require any other special drivers or components to be installed.
-On Windows 7, 8 and 8.1, NVDA uses eSpeak NG by default ([Windows OneCore #OneCore] is used in Windows 10 and later by default).
+On Windows 8.1 NVDA uses eSpeak NG by default ([Windows OneCore #OneCore] is used in Windows 10 and later by default).
 As this synthesizer is built into NVDA, this is a great choice for when running NVDA off a USB thumb drive on other systems.
 
 Each voice that comes with eSpeak NG speaks a different language.

venvUtils/ensureAndActivate.bat

@@ -9,7 +9,7 @@ set scriptsDir=%here%
 set venvLocation=%here%\..\.venv
 
 rem Ensure the environment is created and up to date
-py -3.7-32 "%scriptsDir%\ensureVenv.py"
+py -3.11-32 "%scriptsDir%\ensureVenv.py"
 if ERRORLEVEL 1 goto :EOF
 
 rem Set the necessary environment variables to have Python use this virtual environment.

venvUtils/ensureVenv.py

@@ -173,15 +173,4 @@ def ensureVenvAndRequirements():
 			"Please deactivate the current Python virtual environment and try again."
 		)
 		sys.exit(1)
-	if (
-		sys.version_info.minor == 7
-		and sys.version_info.micro == 6
-	):
-		# #10696: Building with Python 3.7.6 fails. Inform user and exit.
-		Py376FailMsg = (
-			"Error: Building with Python 3.7.6 is not possible.\n"
-			"Please use a more  recent version of Python 3."
-		)
-		print(Py376FailMsg)
-		sys.exit(1)
 	ensureVenvAndRequirements()