Merge pull request #252 from johnhaddon/python310

Python : Update to version 3.10.13

Changes.md

@@ -1,7 +1,7 @@
 8.0.0 alpha x (relative to 8.0.0 alpha 5)
 -------------
 
-
+- Python : Updated to version 3.10.13.
 
 8.0.0 alpha 5 (relative to 8.0.0 alpha 4)
 -------------

Python/config.py

@@ -1,19 +1,13 @@
 {
 
-	"downloads" : [ "https://www.python.org/ftp/python/3.7.6/Python-3.7.6.tgz" ],
+	"downloads" : [ "https://www.python.org/ftp/python/3.10.13/Python-3.10.13.tgz" ],
 
 	"publicVariables" : {
 
-		"pythonVersion" : "3.7",
-		# Python 3 unconditionally puts these infuriating "m" ABI suffixes on
-		# everything. This is intended to allow different types of Python builds
-		# to exist in the same place, but that's not a problem we have. The problem
-		# we _do_ have is that a bunch of our projects get tripped up by these
-		# suffixes. See : https://www.python.org/dev/peps/pep-3149.
-		"pythonABIVersion" : "3.7m",
+		"pythonVersion" : "3.10",
 		"pythonMajorVersion" : "3",
-		"pythonMinorVersion" : "7",
-		"pythonIncludeDir" : "{buildDir}/include/python{pythonABIVersion}",
+		"pythonMinorVersion" : "10",
+		"pythonIncludeDir" : "{buildDir}/include/python{pythonVersion}",
 		"pythonLibDir" : "{buildDir}/lib",
 
 	},
@@ -34,7 +28,7 @@
 
 	"commands" : [
 
-		"./configure --prefix={buildDir} {libraryType} --enable-unicode=ucs4 --with-ensurepip=install --with-system-ffi",
+		"{environmentCommand} ./configure --prefix={buildDir} {libraryType} --enable-unicode=ucs4 --with-ensurepip=install --with-system-ffi",
 		"make -j {jobs}",
 		"make install",
 
@@ -65,16 +59,19 @@
 
 	],
 
-	"platform:macos" : {
+	"platform:linux" : {
+
+		"variables" : {
 
-		# Python 3.7 doesn't compile for M1, so we use 3.8 on Mac until
-		# we upgrade all platforms to a mutually compatible version. We
-		# don't support the Python 2 variant at all on Mac.
-		"downloads" : [
+			# Needed to build Python with OpenSSL 1.1.1 support on Centos 7
+			"environmentCommand" : "CPPFLAGS=\"$(pkg-config --cflags openssl11)\" LDFLAGS=\"$(pkg-config --libs openssl11)\""
 
-			"https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz",
+		}
+
+	},
+
+	"platform:macos" : {
 
-		],
 
 		"variables" : {
 
@@ -90,11 +87,6 @@
 
 		"publicVariables" : {
 
-			# See `downloads`.
-			"pythonVersion" : "3.8",
-			"pythonABIVersion" : "3.8m",
-			"pythonMajorVersion" : "3",
-			"pythonMinorVersion" : "8",
 
 			"pythonIncludeDir" : "{buildDir}/lib/Python.framework/Headers",
 			"pythonLibDir" : "{buildDir}/lib/Python.framework/Versions/{pythonVersion}/lib",