diff --git a/.github/workflows/build-container.yaml b/.github/workflows/build-container.yaml index 6c9ab03a..79042c80 100644 --- a/.github/workflows/build-container.yaml +++ b/.github/workflows/build-container.yaml @@ -40,7 +40,7 @@ jobs: ## Install build dependancies from apt apt-get update apt-get install -y build-essential curl git libssl-dev libffi-dev libbz2-dev libgdbm-compat-dev libgdbm-dev liblzma-dev libreadline-dev libtool \ - ninja-build python3 python3-pip tcl8.6-dev tk8.6-dev texinfo software-properties-common wget + ninja-build python3 python3-pip tcl8.6-dev tk8.6-dev texinfo software-properties-common wget libc6 python3 -m pip install boto3 certifi # Install Clang/GCC at specific version apt-get install -y clang-${CLANG_VER} gcc-${GCC_VER} g++-${GCC_VER} diff --git a/package-system/python/Dockerfile.linux b/package-system/python/Dockerfile similarity index 95% rename from package-system/python/Dockerfile.linux rename to package-system/python/Dockerfile index fa2d7f5a..d34d0a6a 100644 --- a/package-system/python/Dockerfile.linux +++ b/package-system/python/Dockerfile @@ -5,7 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT # - # The cpu architecture to base the docker base script from ARG INPUT_ARCHITECTURE=amd64 @@ -39,7 +38,7 @@ RUN apt-get clean && apt-get update # Setup time zone and locale data (necessary for SSL and HTTPS packages) RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata locales keyboard-configuration -# Install the development packages needed to build AWS Gamelift +# Install the development packages needed to build python RUN apt-get install -y autoconf \ build-essential \ cmake \ @@ -50,6 +49,7 @@ RUN apt-get install -y autoconf \ liblzma-dev \ libreadline-dev \ libtool \ + python3-dev \ python3 \ tcl8.6-dev \ tk8.6-dev \ diff --git a/package-system/python/FindPython.cmake.linux b/package-system/python/FindPython.cmake.linux index c1f454a0..58515003 100644 --- a/package-system/python/FindPython.cmake.linux +++ b/package-system/python/FindPython.cmake.linux @@ -8,4 +8,4 @@ # force this into config mode, so that it uses the config files instead of module files. set(Python_DIR ${CMAKE_CURRENT_LIST_DIR}) -find_package(Python 3.10.5 REQUIRED CONFIG) +find_package(Python 3.10.13 REQUIRED CONFIG) diff --git a/package-system/python/build-linux.sh b/package-system/python/build-linux.sh index 7d9e35af..7f6bf004 100755 --- a/package-system/python/build-linux.sh +++ b/package-system/python/build-linux.sh @@ -157,7 +157,7 @@ docker build --build-arg INPUT_DOCKER_BUILD_SCRIPT=${DOCKER_BUILD_SCRIPT}\ --build-arg INPUT_ARCHITECTURE=${DOCKER_INPUT_ARCHITECTURE}\ --build-arg INPUT_IMAGE=ubuntu:${UBUNTU_BASE}\ --build-arg INPUT_DEPENDENT_PACKAGE_FOLDERS=\"${DEP_PACKAGES_DOCKER_FOLDERNAMES}\"\ - -f Dockerfile.linux -t ${DOCKER_IMAGE_NAME}:latest temp" + -f Dockerfile -t ${DOCKER_IMAGE_NAME}:latest temp" echo $CMD_DOCKER_BUILD eval $CMD_DOCKER_BUILD diff --git a/package-system/python/build_config.json b/package-system/python/build_config.json index 6cab599a..44324a76 100644 --- a/package-system/python/build_config.json +++ b/package-system/python/build_config.json @@ -1,8 +1,8 @@ { "git_url":"https://github.com/python/cpython.git", - "git_tag":"v3.10.5", + "git_tag":"v3.10.13", "package_name":"python", - "package_version":"3.10.5-rev4", + "package_version":"3.10.13-rev1", "package_url":"https://python.org", "package_license":"PSF-2.0", "package_license_file":"LICENSE", @@ -25,7 +25,8 @@ "./package-linux.sh" ], "custom_test_cmd": [ - "./test-linux.sh" + "./test-linux.sh", + "x86_64" ] }, "Linux-aarch64":{ @@ -35,7 +36,7 @@ ], "custom_build_cmd": [ "./build-linux.sh", - "python_3_10_5", + "python_3_10_13", "20.04", "aarch64" ], @@ -43,7 +44,8 @@ "./package-linux.sh" ], "custom_test_cmd": [ - "./test-linux.sh" + "./test-linux.sh", + "aarch64" ] } } diff --git a/package-system/python/darwin_x64/FindPython.cmake b/package-system/python/darwin_x64/FindPython.cmake index c5b1b9a6..ddbb3087 100644 --- a/package-system/python/darwin_x64/FindPython.cmake +++ b/package-system/python/darwin_x64/FindPython.cmake @@ -24,7 +24,7 @@ endif() # Python_Development_FOUND - The platform we are cross compiling for can link to python # and a target called 3rdParty::Python that you can use to depend on set(PY_BASE_DIR ${CMAKE_CURRENT_LIST_DIR}/Python.framework/Versions/3.10) -set(${MY}_VERSION 3.10.5) +set(${MY}_VERSION 3.10.13) set(${MY}_INTERPRETER_ID "Python") set(${MY}_EXECUTABLE ${PY_BASE_DIR}/bin/python3) set(${MY}_HOME ${PY_BASE_DIR}) diff --git a/package-system/python/darwin_x64/PackageInfo.json b/package-system/python/darwin_x64/PackageInfo.json index afc3513b..d7824660 100644 --- a/package-system/python/darwin_x64/PackageInfo.json +++ b/package-system/python/darwin_x64/PackageInfo.json @@ -1,5 +1,5 @@ { - "PackageName" : "python-3.10.5-rev2-darwin", + "PackageName" : "python-3.10.13-rev1-darwin", "License" : "PSF-2.0", "URL" : "https://python.org", "LicenseFile" : "LICENSE" diff --git a/package-system/python/darwin_x64/make-python.sh b/package-system/python/darwin_x64/make-python.sh index 56ad7414..3c7155e9 100755 --- a/package-system/python/darwin_x64/make-python.sh +++ b/package-system/python/darwin_x64/make-python.sh @@ -59,9 +59,9 @@ cd temp mkdir $SCRIPT_DIR/package echo "" -echo "---------------- Cloning python 3.10.5 from git ----------------" +echo "---------------- Cloning python 3.10.13 from git ----------------" echo "" -git clone https://github.com/python/cpython.git --branch "v3.10.5" --depth 1 +git clone https://github.com/python/cpython.git --branch "v3.10.13" --depth 1 retVal=$? if [ $retVal -ne 0 ]; then echo "Error cloning python from https://github.com/python/cpython.git" @@ -106,6 +106,7 @@ echo "---------------- Installing spinx documentation tool into the v-env ------ echo "" $VENV_BIN_DIR/python3 -m pip install sphinx + cd $RELOC_SRC_DIR echo "" @@ -167,8 +168,8 @@ cd $RELOC_SRC_DIR echo "" echo "---------------- Altering the produced framework folder to be relocatable ----------------" echo "" -echo $VENV_BIN_DIR/python3 ./make_relocatable_python_framework.py --install-wheel --upgrade-pip --python-version 3.10.5 --use-existing-framework $FRAMEWORK_OUTPUT_FOLDER/Python.framework -$VENV_BIN_DIR/python3 ./make_relocatable_python_framework.py --install-wheel --upgrade-pip --python-version 3.10.5 --use-existing-framework $FRAMEWORK_OUTPUT_FOLDER/Python.framework +echo $VENV_BIN_DIR/python3 ./make_relocatable_python_framework.py --install-wheel --upgrade-pip --python-version 3.10.13 --use-existing-framework $FRAMEWORK_OUTPUT_FOLDER/Python.framework +$VENV_BIN_DIR/python3 ./make_relocatable_python_framework.py --install-wheel --upgrade-pip --python-version 3.10.13 --use-existing-framework $FRAMEWORK_OUTPUT_FOLDER/Python.framework retVal=$? if [ $retVal -ne 0 ]; then echo "Could not make python relocatable!" @@ -209,9 +210,6 @@ echo "" echo "---------------- Removing pip references from ensurepip ----------------" echo "" rm -f $SCRIPT_DIR/package/Python.framework/Versions/3.10/lib/python3.10/ensurepip/_bundled/pip-20*.whl -cat $SCRIPT_DIR/package/Python.framework/Versions/3.10/lib/python3.10/ensurepip/__init__.py | sed 's/"20.1.1"/"22.0.3"/g' | sed 's/("pip", _PIP_VERSION, "py2.py3"),//g' > $SCRIPT_DIR/package/python/lib/python3.10/ensurepip/__init__.py_temp -rm $SCRIPT_DIR/package/Python.framework/Versions/3.10/lib/python3.10/ensurepip/__init__.py -mv $SCRIPT_DIR/package/Python.framework/Versions/3.10/lib/python3.10/ensurepip/__init__.py_temp $SCRIPT_DIR/package/python/lib/python3.10/ensurepip/__init__.py echo "" echo "---------------- Cleaning temp folder ----------------" diff --git a/package-system/python/darwin_x64/open3d_python.patch b/package-system/python/darwin_x64/open3d_python.patch index 8b31cfcb..be498c6e 100644 --- a/package-system/python/darwin_x64/open3d_python.patch +++ b/package-system/python/darwin_x64/open3d_python.patch @@ -1,8 +1,21 @@ diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py -index 4308a20..ec54cfb 100755 +index 8f33537..dad3d0c 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py -@@ -274,7 +274,7 @@ def library_recipes(): +@@ -264,17 +264,17 @@ def library_recipes(): + tk_patches = ['tk868_on_10_8_10_9.patch'] + + else: +- tcl_tk_ver='8.6.12' +- tcl_checksum='87ea890821d2221f2ab5157bc5eb885f' ++ tcl_tk_ver='8.6.13' ++ tcl_checksum='0e4358aade2f5db8a8b6f2f6d9481ec2' + +- tk_checksum='1d6dcf6120356e3d211e056dff5e462a' ++ tk_checksum='95adc33d55a133ee29bc9f81efdf31b2' + tk_patches = [ ] + + result.extend([ dict( name="Tcl %s"%(tcl_tk_ver,), @@ -28,7 +41,16 @@ index 4308a20..ec54cfb 100755 ] ), ]) -@@ -1005,19 +1006,29 @@ def buildRecipe(recipe, basedir, archList): +@@ -347,7 +348,7 @@ def library_recipes(): + "--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib"%(getVersion(),), + ], + patchscripts=[ +- ("ftp://ftp.invisible-island.net/ncurses//5.9/ncurses-5.9-20120616-patch.sh.bz2", ++ ("https://src.fedoraproject.org/repo/pkgs/ncurses/ncurses-5.9-20120616-patch.sh.bz2/f54bf02a349f96a7c4f0d00922f3a0d4/ncurses-5.9-20120616-patch.sh.bz2", + "f54bf02a349f96a7c4f0d00922f3a0d4"), + ], + useLDFlags=False, +@@ -1011,19 +1012,29 @@ def buildRecipe(recipe, basedir, archList): configure_args.remove('--disable-shared') configure_args.extend(args) @@ -70,7 +92,7 @@ index 4308a20..ec54cfb 100755 else: configure_args.extend([ "CFLAGS=%s-mmacosx-version-min=%s -arch %s " -@@ -1540,8 +1551,9 @@ def buildInstaller(): +@@ -1546,8 +1557,9 @@ def buildInstaller(): pkgroot = os.path.join(outdir, 'Python.mpkg', 'Contents') pkgcontents = os.path.join(pkgroot, 'Packages') os.makedirs(pkgcontents) @@ -81,4 +103,39 @@ index 4308a20..ec54cfb 100755 + return rsrcDir = os.path.join(pkgroot, 'Resources') - \ No newline at end of file + +diff --git a/Doc/Makefile b/Doc/Makefile +index 4188f88..324acc4 100644 +--- a/Doc/Makefile ++++ b/Doc/Makefile +@@ -12,7 +12,7 @@ JOBS = auto + PAPER = + SOURCES = + DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py) +-SPHINXERRORHANDLING = -W ++SPHINXERRORHANDLING = + + # Internal variables. + PAPEROPT_a4 = -D latex_elements.papersize=a4paper +diff --git a/Doc/requirements.txt b/Doc/requirements.txt +index f43ce2c..2578393 100644 +--- a/Doc/requirements.txt ++++ b/Doc/requirements.txt +@@ -3,13 +3,13 @@ + # Sphinx version is pinned so that new versions that introduce new warnings + # won't suddenly cause build failures. Updating the version is fine as long + # as no warnings are raised by doing so. +-sphinx==3.4.3 ++sphinx + # Docutils version is pinned to a version compatible with Sphinx + # version <3.5.4. It can be removed after bumping Sphinx version to at + # least 3.5.4. +-docutils==0.17.1 ++docutils + # Jinja version is pinned to a version compatible with Sphinx version <4.5. +-jinja2==3.0.3 ++jinja2 + + blurb + + diff --git a/package-system/python/linux_x64/FindPython.cmake b/package-system/python/linux_x64/FindPython.cmake index c1f454a0..58515003 100644 --- a/package-system/python/linux_x64/FindPython.cmake +++ b/package-system/python/linux_x64/FindPython.cmake @@ -8,4 +8,4 @@ # force this into config mode, so that it uses the config files instead of module files. set(Python_DIR ${CMAKE_CURRENT_LIST_DIR}) -find_package(Python 3.10.5 REQUIRED CONFIG) +find_package(Python 3.10.13 REQUIRED CONFIG) diff --git a/package-system/python/linux_x64/PackageInfo.json b/package-system/python/linux_x64/PackageInfo.json index 12ceddad..1eca2d2b 100644 --- a/package-system/python/linux_x64/PackageInfo.json +++ b/package-system/python/linux_x64/PackageInfo.json @@ -1,5 +1,5 @@ { - "PackageName" : "python-3.10.5-rev2-linux", + "PackageName" : "python-3.10.13-rev1-linux", "License" : "PSF-2.0", "URL" : "https://python.org", "LicenseFile" : "python/LICENSE" diff --git a/package-system/python/linux_x64/make-python.sh b/package-system/python/linux_x64/make-python.sh index d34e62b4..a8ebb47f 100755 --- a/package-system/python/linux_x64/make-python.sh +++ b/package-system/python/linux_x64/make-python.sh @@ -47,10 +47,10 @@ mkdir -p temp echo "" -echo "--------------- Cloning python 3.10.5 from git ---------------" +echo "--------------- Cloning python 3.10.13 from git ---------------" echo "" cd temp -git clone https://github.com/python/cpython.git --branch v3.10.5 --depth 1 +git clone https://github.com/python/cpython.git --branch v3.10.13 --depth 1 if [[ ! -d "cpython" ]]; then echo "Was unable to create cpython dir via git clone. Is git installed?" @@ -108,9 +108,9 @@ popd echo "" -echo "--------------- Cloning openssl 1.1.1q and building it externally ---------------" +echo "--------------- Cloning openssl 1.1.1w and building it externally ---------------" echo "" -git clone https://github.com/openssl/openssl.git --branch "OpenSSL_1_1_1q" --depth 1 +git clone https://github.com/openssl/openssl.git --branch "OpenSSL_1_1_1w" --depth 1 if [[ ! -d "openssl" ]]; then echo "Was unable to create openssl dir via git clone." exit 1 @@ -174,7 +174,7 @@ fi # Prepare the package folder cd $SCRIPT_DIR -# Install the newly built python 3.10.5 to the package/python folder +# Install the newly built python 3.10.13 to the package/python folder cd $SCRIPT_DIR cd temp cd cpython diff --git a/package-system/python/linux_x64/python-config-version.cmake b/package-system/python/linux_x64/python-config-version.cmake index 9eead6e7..dea7e088 100644 --- a/package-system/python/linux_x64/python-config-version.cmake +++ b/package-system/python/linux_x64/python-config-version.cmake @@ -9,7 +9,7 @@ # this file is called to make sure that if we request a specific version # we respond only to that version -set(PACKAGE_VERSION 3.10.5) +set(PACKAGE_VERSION 3.10.13) set(PACKAGE_VERSION_EXACT False) set(PACKAGE_VERSION_COMPATIBLE False) @@ -25,7 +25,7 @@ if (PACKAGE_FIND_VERSION_COUNT GREATER 1 AND NOT PACKAGE_FIND_VERSION_MINOR EQUA return() endif() -if (PACKAGE_FIND_VERSION_COUNT GREATER 2 AND NOT PACKAGE_FIND_VERSION_PATCH EQUAL 5) +if (PACKAGE_FIND_VERSION_COUNT GREATER 2 AND NOT PACKAGE_FIND_VERSION_PATCH EQUAL 13) return() endif() diff --git a/package-system/python/linux_x64/python-config.cmake b/package-system/python/linux_x64/python-config.cmake index 8b4906aa..bf963f1c 100644 --- a/package-system/python/linux_x64/python-config.cmake +++ b/package-system/python/linux_x64/python-config.cmake @@ -24,7 +24,7 @@ endif() # Python_Development_FOUND - The platform we are cross compiling for can link to python # and a target called 3rdParty::Python that you can use to depend on -set(${MY}_VERSION 3.10.5) +set(${MY}_VERSION 3.10.13) set(${MY}_INTERPRETER_ID "Python") set(${MY}_EXECUTABLE ${CMAKE_CURRENT_LIST_DIR}/python/bin/python) set(${MY}_HOME ${CMAKE_CURRENT_LIST_DIR}/python) diff --git a/package-system/python/quick_validate_python.py b/package-system/python/quick_validate_python.py index a8ea0743..1907f52a 100644 --- a/package-system/python/quick_validate_python.py +++ b/package-system/python/quick_validate_python.py @@ -8,6 +8,8 @@ # this script is run on built python executables to make sure they function. +print("Simple import validation started") + import sys try: diff --git a/package-system/python/test-linux.sh b/package-system/python/test-linux.sh index bd8fd892..c65404da 100755 --- a/package-system/python/test-linux.sh +++ b/package-system/python/test-linux.sh @@ -5,6 +5,34 @@ # # SPDX-License-Identifier: Apache-2.0 OR MIT -temp/build/python/bin/python3 quick_validate_python.py -exit $? +# Only run tests for packages on the same architecture +TARGET_ARCH=$1 +CURRENT_HOST_ARCH=$(uname -m) + +if [ "${CURRENT_HOST_ARCH}" != "${TARGET_ARCH}" ] +then + echo Cannot run the test for a ${TARGET_ARCH} on the current ${CURRENT_HOST_ARCH} architecture. Skipping test. + exit 0 +fi + +echo "Testing python" + + +echo temp/build/python/bin/python3 --version +temp/build/python/bin/python3 --version 2>&1 +if [ $? -ne 0 ] +then + echo "Error running validating python interpreter version" + exit 1 +fi + +echo temp/build/python/bin/python3 quick_validate_python.py +temp/build/python/bin/python3 quick_validate_python.py 2>&1 +if [ $? -ne 0 ] +then + echo "Error running the python interpreter against quick_validate_python.py" + exit 1 +fi + +exit 0 diff --git a/package-system/python/win_x64/FindPython.cmake b/package-system/python/win_x64/FindPython.cmake index abc5e8c3..ab428bc2 100644 --- a/package-system/python/win_x64/FindPython.cmake +++ b/package-system/python/win_x64/FindPython.cmake @@ -8,4 +8,4 @@ # force this into config mode, so that it uses the config files instead of module files. set(Python_DIR ${CMAKE_CURRENT_LIST_DIR}) -find_package(Python 3.10.5 REQUIRED CONFIG) +find_package(Python 3.10.13 REQUIRED CONFIG) diff --git a/package-system/python/win_x64/PackageInfo.json b/package-system/python/win_x64/PackageInfo.json index d7f474df..5a7db2e8 100644 --- a/package-system/python/win_x64/PackageInfo.json +++ b/package-system/python/win_x64/PackageInfo.json @@ -1,5 +1,5 @@ { - "PackageName" : "python-3.10.5-rev1-windows", + "PackageName" : "python-3.10.13-rev1-windows", "URL" : "https://python.org", "License" : "PSF-2.0", "LicenseFile" : "python/LICENSE.txt" diff --git a/package-system/python/win_x64/build_python.bat b/package-system/python/win_x64/build_python.bat index 9bb23276..5985c7dd 100644 --- a/package-system/python/win_x64/build_python.bat +++ b/package-system/python/win_x64/build_python.bat @@ -29,16 +29,21 @@ set vswhere_location=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer echo adding %vswhere_location% to PATH set PATH=%vswhere_location%;%PATH% -for /f "tokens=*" %%i in ('vswhere -version [15.0^,16.0^) -property installationPath') do set VS2017_LOCATION=%%i +for /f "tokens=*" %%i in ('vswhere -version [16.0^,17.0^) -property installationPath') do set VS2019_LOCATION=%%i -echo Using Visual Studio: %VS2017_LOCATION% +echo Using Visual Studio: %VS2019_LOCATION% -if NOT exist "%VS2017_LOCATION%\Common7\Tools\vsdevcmd.bat" ( - echo Could not find visual studio 2017 installed - exit /B 1 - ) -call "%VS2017_LOCATION%\Common7\Tools\vsdevcmd.bat" +if NOT exist "%VS2019_LOCATION%\Common7\Tools\vsdevcmd.bat" ( + IF NOT DEFINED VCINSTALLDIR ( + echo Unable to find visual studio 2019 and the visual studio environment has not been set up + exit /B 1 + ) ELSE ( + echo Unable to find visual studio 2019 but found Visual Studio installed at %VCINSTALLDIR% + ) + ) ELSE ( + call "%VS2019_LOCATION%\Common7\Tools\vsdevcmd.bat" +) echo Clearing %tempdir% if present... rmdir /s /q %tempdir% > NUL @@ -49,8 +54,8 @@ mkdir %outputdir% mkdir %tempdir% cd /d %tempdir% -echo Cloning python from git using v3.10.5.. -git clone https://github.com/python/cpython.git --branch "v3.10.5" --depth 1 +echo Cloning python from git using v3.10.13.. +git clone https://github.com/python/cpython.git --branch "v3.10.13" --depth 1 if %ERRORLEVEL% NEQ 0 ( echo "Git clone failed" exit /B 1 @@ -62,11 +67,13 @@ if %ERRORLEVEL% NEQ 0 ( echo "Git clone failed" exit /B 1 ) -copy /Y /V libexpat/expat/lib/*.h cpython/Modules/expat/ -copy /Y /V libexpat/expat/lib/*.c cpython/Modules/expat/ +echo copy /Y /V libexpat\expat\lib\*.h cpython\Modules\expat\ +copy /Y /V libexpat\expat\lib\*.h cpython\Modules\expat\ -cd /d %python_src% +echo copy /Y /V libexpat/expat/lib/*.c cpython/Modules/expat/ +copy /Y /V libexpat\expat\lib\*.c cpython\Modules\expat\ +cd /d %python_src% REM If the patch file 'open3d_python.patch' file exists, then apply the patch set patch_file=%ScriptDir%\open3d_python.patch diff --git a/package-system/python/win_x64/open3d_python.patch b/package-system/python/win_x64/open3d_python.patch index 2ead1621..8ab95873 100644 --- a/package-system/python/win_x64/open3d_python.patch +++ b/package-system/python/win_x64/open3d_python.patch @@ -7,7 +7,7 @@ index d0e4a86..cb7f933 100644 @rem If we have Python in externals, use that one -@if exist "%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") & (set _Py_Python_Source=found in externals directory) & goto :found -+@if exist "%_Py_EXTERNALS_DIR%\python.3.10.5\tools\python.exe" (set PYTHON="%_Py_EXTERNALS_DIR%\python.3.10.5\tools\python.exe") & (set _Py_Python_Source=found in externals directory) & goto :found ++@if exist "%_Py_EXTERNALS_DIR%\python.3.10.13\tools\python.exe" (set PYTHON="%_Py_EXTERNALS_DIR%\python.3.10.13\tools\python.exe") & (set _Py_Python_Source=found in externals directory) & goto :found @rem If HOST_PYTHON is recent enough, use that @if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -Ec "import sys; assert sys.version_info[:2] >= (3, 8)" >nul 2>nul && (set PYTHON="%HOST_PYTHON%") && (set _Py_Python_Source=found as HOST_PYTHON) && goto :found @@ -23,10 +23,10 @@ index d0e4a86..cb7f933 100644 ) @echo Installing Python via nuget... -@"%_Py_NUGET%" install pythonx86 -ExcludeVersion -OutputDirectory "%_Py_EXTERNALS_DIR%" -+@"%_Py_NUGET%" install python -Version 3.10.5 -OutputDirectory "%_Py_EXTERNALS_DIR%" ++@"%_Py_NUGET%" install python -Version 3.10.13 -OutputDirectory "%_Py_EXTERNALS_DIR%" @rem Quote it here; it's not quoted later because "py -x.y" wouldn't work -@if not errorlevel 1 (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") & (set _Py_Python_Source=found on nuget.org) & goto :found -+@if not errorlevel 1 (set PYTHON="%_Py_EXTERNALS_DIR%\python.3.10.5\tools\python.exe") & (set _Py_Python_Source=found on nuget.org) & goto :found ++@if not errorlevel 1 (set PYTHON="%_Py_EXTERNALS_DIR%\python.3.10.13\tools\python.exe") & (set _Py_Python_Source=found on nuget.org) & goto :found @set _Py_Python_Source= diff --git a/package-system/python/win_x64/python-config-version.cmake b/package-system/python/win_x64/python-config-version.cmake index 9eead6e7..dea7e088 100644 --- a/package-system/python/win_x64/python-config-version.cmake +++ b/package-system/python/win_x64/python-config-version.cmake @@ -9,7 +9,7 @@ # this file is called to make sure that if we request a specific version # we respond only to that version -set(PACKAGE_VERSION 3.10.5) +set(PACKAGE_VERSION 3.10.13) set(PACKAGE_VERSION_EXACT False) set(PACKAGE_VERSION_COMPATIBLE False) @@ -25,7 +25,7 @@ if (PACKAGE_FIND_VERSION_COUNT GREATER 1 AND NOT PACKAGE_FIND_VERSION_MINOR EQUA return() endif() -if (PACKAGE_FIND_VERSION_COUNT GREATER 2 AND NOT PACKAGE_FIND_VERSION_PATCH EQUAL 5) +if (PACKAGE_FIND_VERSION_COUNT GREATER 2 AND NOT PACKAGE_FIND_VERSION_PATCH EQUAL 13) return() endif() diff --git a/package-system/python/win_x64/python-config.cmake b/package-system/python/win_x64/python-config.cmake index 044633e4..e8b84cc1 100644 --- a/package-system/python/win_x64/python-config.cmake +++ b/package-system/python/win_x64/python-config.cmake @@ -24,7 +24,7 @@ endif() # Python_Development_FOUND - The platform we are cross compiling for can link to python # and a target called 3rdParty::Python that you can use to depend on -set(${MY}_VERSION 3.10.5) +set(${MY}_VERSION 3.10.13) set(${MY}_INTERPRETER_ID "Python") set(${MY}_EXECUTABLE ${CMAKE_CURRENT_LIST_DIR}/python/python.exe) set(${MY}_HOME ${CMAKE_CURRENT_LIST_DIR}/python) diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index bbb90e24..da85252c 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -40,7 +40,7 @@ "astc-encoder-3.2-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean", "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean", "azslc-1.8.19-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Mac --package-root ../../package-system/azslc/temp --clean", - "python-3.10.5-rev2-darwin": "package-system/python/build_package_image.py", + "python-3.10.13-rev1-darwin": "package-system/python/build_package_image.py", "mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.2-rev1", "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac", "mikkelsen-1.0.0.4-ios": "package-system/mikkelsen/build_package_image.py --platform ios", @@ -79,7 +79,7 @@ "openimageio-opencolorio-2.3.17-rev3-mac": "package-system/openimageio-opencolorio/temp/package-darwin", "tiff-4.2.0.15-rev3-mac": "package-system/tiff-mac", "tiff-4.2.0.15-rev3-ios": "package-system/tiff-ios", - "python-3.10.5-rev2-darwin": "package-system/python/darwin_x64/package", + "python-3.10.13-rev1-darwin": "package-system/python/darwin_x64/package", "asn1-0.9.27-rev2-ios": "package-system/asn1-ios", "PhysX-4.1.2.29882248-rev8-mac": "package-system/PhysX-mac", "PhysX-4.1.2.29882248-rev8-ios": "package-system/PhysX-ios", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index 3d79eaa6..ff2c9bfa 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -33,7 +33,7 @@ "png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean", "poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri/build_package_image.py --platform-name linux-aarch64", "pyside2-5.15.2.1-py3.10-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux-aarch64 --clean", - "python-3.10.5-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", + "python-3.10.13-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", "qt-5.15.2-rev9-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean", "sdformat-13.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean", "SPIRVCross-1.3.275.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean", @@ -74,7 +74,7 @@ "png-1.6.37-rev2-linux-aarch64": "package-system/libpng/temp/png-linux-aarch64", "poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri-linux-aarch64", "pyside2-5.15.2.1-py3.10-rev4-linux-aarch64": "package-system/pyside2/temp/pyside2-linux-aarch64", - "python-3.10.5-rev4-linux-aarch64": "package-system/python/temp/python-linux-aarch64", + "python-3.10.13-rev1-linux-aarch64": "package-system/python/temp/python-linux-aarch64", "qt-5.15.2-rev9-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64", "sdformat-13.5.0-rev2-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64", "SPIRVCross-1.3.275.0-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index cb3b08cb..6a8e0317 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -41,8 +41,8 @@ "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean", "azslc-1.8.19-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux --package-root ../../package-system/azslc/temp --clean", "tiff-4.2.0.15-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux --package-root ../../package-system --clean", - "python-3.10.5-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean", - "python-3.10.5-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", + "python-3.10.13-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean", + "python-3.10.13-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py", "qt-5.15.2-rev9-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean", "zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean", @@ -82,8 +82,8 @@ "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux": "package-system/DirectXShaderCompilerDxc-linux", "azslc-1.8.19-rev1-linux": "package-system/azslc/temp/azslc-linux", "tiff-4.2.0.15-rev3-linux": "package-system/tiff-linux", - "python-3.10.5-rev4-linux": "package-system/python/temp/python-linux", - "python-3.10.5-rev4-linux-aarch64": "package-system/python/temp/python-linux-aarch64", + "python-3.10.13-rev1-linux": "package-system/python/temp/python-linux", + "python-3.10.13-rev1-linux-aarch64": "package-system/python/temp/python-linux-aarch64", "PhysX-4.1.2.29882248-rev8-linux": "package-system/PhysX-linux", "PhysX-5.1.1-rev4-linux": "package-system/PhysX5/temp/PhysX5-linux", "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 9ddd3a75..2972ecb6 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -50,7 +50,7 @@ "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri/build_package_image.py --platform-name windows", "pybind11-2.10.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pybind11 --platform-name multiplatform --package-root ../../package-system/pybind11/temp --clean", "pyside2-5.15.2.1-py3.10-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Windows --package-root ../../package-system/pyside2/temp --clean", - "python-3.10.5-rev1-windows": "package-system/python/build_package_image.py", + "python-3.10.13-rev1-windows": "package-system/python/build_package_image.py", "qt-5.15.2-rev7-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system/Qt/temp --clean", "RapidJSON-1.1.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/RapidJSON --platform-name multiplatform --package-root ../../package-system", "SPIRVCross-1.3.275.0-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean", @@ -120,7 +120,7 @@ "PVRTexTool-4.24.0-rev4-multiplatform": "package-system/PVRTexTool-multiplatform", "pybind11-2.10.0-rev1-multiplatform": "package-system/pybind11/temp/pybind11-multiplatform", "pyside2-5.15.2.1-py3.10-rev3-windows": "package-system/pyside2/temp/pyside2-windows", - "python-3.10.5-rev1-windows": "package-system/python/win_x64/package", + "python-3.10.13-rev1-windows": "package-system/python/win_x64/package", "qt-5.15.2-rev7-windows": "package-system/Qt/temp/qt-windows", "RapidJSON-1.1.0-rev1-multiplatform": "package-system/RapidJSON-multiplatform", "RapidXML-1.13-rev1-multiplatform": "package-system/RapidXML-multiplatform",