[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-kimageshop
Subject:    =?utf-8?q?=5Bgraphics/krita=5D_3rdparty/ext=5Fpython=3A_python=3A_Revert_upgrade_to_3=2E10_on_Window
From:       L. E. Segovia <null () kde ! org>
Date:       2023-01-24 3:27:17
Message-ID: 20230124032717.6A7111241B3E () leptone ! kde ! org
[Download RAW message or body]

Git commit ed6d5e622f4376cc6888f4cc2bb5b397ef644e8c by L. E. Segovia.
Committed on 24/01/2023 at 03:26.
Pushed by lsegovia into branch 'master'.

python: Revert upgrade to 3.10 on Windows

Unfortunately, CI still relies on 3.8 for its virtualenv. Filed T16165
with sysadmin to confirm the version, and if an upgrade is possible.

BUG:464518
CCMAIL:kimageshop@kde.org

M  +6    -8    3rdparty/ext_python/CMakeLists.txt

https://invent.kde.org/graphics/krita/commit/ed6d5e622f4376cc6888f4cc2bb5b397ef644e8c

diff --git a/3rdparty/ext_python/CMakeLists.txt b/3rdparty/ext_python/CMakeLists.txt
index 5e1c5d35e3..db6447b8fc 100644
--- a/3rdparty/ext_python/CMakeLists.txt
+++ b/3rdparty/ext_python/CMakeLists.txt
@@ -64,20 +64,18 @@ if (UNIX)
     )
     endif()
 elseif(WIN32)
-    ExternalProject_Add( ext_python
+        ExternalProject_Add( ext_python
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-        URL https://www.python.org/ftp/python/3.10.7/python-3.10.7-embed-amd64.zip
-        URL_MD5 7f90f8642c1b19cf02bce91a5f4f9263
+        URL https://www.python.org/ftp/python/3.8.1/python-3.8.1-embed-amd64.zip
+        URL_MD5 4d091857a2153d9406bb5c522b211061
 
         INSTALL_DIR ${PREFIX_ext_python}
         CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ${CMAKE_COMMAND} -E echo deploying python3 64-bit binary
-                COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/ \
${PREFIX_ext_python}/python +        BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying \
python3 64-bit binary +        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory \
                <SOURCE_DIR>/ ${PREFIX_ext_python}/python
                 COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/python3.dll \
                ${PREFIX_ext_python}/bin
-                COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/python310.dll \
${PREFIX_ext_python}/bin +                COMMAND ${CMAKE_COMMAND} -E copy \
                <SOURCE_DIR>/python38.dll ${PREFIX_ext_python}/bin
                 COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/vcruntime140.dll \
                ${PREFIX_ext_python}/bin
-                COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/vcruntime140_1.dll \
                ${PREFIX_ext_python}/bin
                 COMMAND ${CMAKE_COMMAND} -E make_directory \
                ${PREFIX_ext_python}/lib/site-packages/
                 COMMAND ${CMAKE_COMMAND} -E copy \
${CMAKE_CURRENT_SOURCE_DIR}/sitecustomize.py ${PREFIX_ext_python}/lib/site-packages/  \
UPDATE_COMMAND ""


[prev in list] [next in list] [prev in thread] [next in thread]