Integrating latest 47acbe8

python/.gitignore

@@ -1 +1,2 @@
+downloaded_packages/
 runtime/

python/get_python.cmake

@@ -18,9 +18,16 @@
 
 cmake_minimum_required(VERSION 3.17)
 
-string(TOLOWER ${PAL_PLATFORM_NAME} PAL_PLATFORM_NAME_LOWERCASE)
+if(LY_3RDPARTY_PATH)
+    file(TO_CMAKE_PATH ${LY_3RDPARTY_PATH} LY_3RDPARTY_PATH)
+endif()
 
-include(cmake/3rdPartyPackages.cmake)
+function(o3de_current_file_path path)
+    set(${path} ${CMAKE_CURRENT_FUNCTION_LIST_DIR} PARENT_SCOPE)
+endfunction()
+
+o3de_current_file_path(current_path)
+file(REAL_PATH ${current_path}/.. LY_ROOT_FOLDER)
 
 set(LY_PACKAGE_KEEP_AFTER_DOWNLOADING FALSE)
 include(cmake/LYPython.cmake)

python/python.cmd

@@ -30,13 +30,20 @@ exit /B 1
 :PYTHONHOME_EXISTS
 
 SET PYTHON=%PYTHONHOME%\python.exe
+SET PYTHON_ARGS=%*
+
+IF [%1] EQU [debug] (
+    SET PYTHON=%PYTHONHOME%\python_d.exe
+    SET PYTHON_ARGS=%PYTHON_ARGS:~6%
+)
+
 IF EXIST "%PYTHON%" GOTO PYTHON_EXISTS
 
-ECHO Could not find python.exe in %PYTHONHOME%
+ECHO Could not find python executable at %PYTHON%
 exit /B 1
 
 :PYTHON_EXISTS
 
 SET PYTHONNOUSERSITE=1
-"%PYTHON%" %*
+"%PYTHON%" %PYTHON_ARGS%
 exit /B %ERRORLEVEL%

python/requirements.txt

@@ -2,10 +2,10 @@ atomicwrites==1.4.0 \
     --hash=sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197 \
     --hash=sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a \
     # via -r .\requirements.txt, pytest
-attrs==19.3.0 \
-    --hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \
-    --hash=sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 \
-    # via -r .\requirements.txt, pytest
+attrs==20.1.0 \
+    --hash=sha256:0ef97238856430dcf9228e07f316aefc17e8939fc8507e18c6501b761ef1a42a \
+    --hash=sha256:2867b7b9f8326499ab5b0e2d12801fa5c98842d2cbd22b35112ae04bf85b4dff
+    # via -r .\requirements.txt
 boto3==1.12.21 \
     --hash=sha256:50105a25e301e20b361b2b8fafee196a425a4758e51f400a0f381d42e4bd909e \
     --hash=sha256:5fe70e656f92e4e649dc4cf05786f57d180e5d491bcb22c80411512ec2b27c15 \
@@ -254,6 +254,7 @@ scipy==1.4.1 \
     --hash=sha256:dc60bb302f48acf6da8ca4444cfa17d52c63c5415302a9ee77b3b21618090521 \
     --hash=sha256:dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59 \
     # via requirements.txt
+
 six==1.13.0 \
     --hash=sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd \
     --hash=sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66 \