From 525b7cf4814cc8e591882f557f524dc58c482727 Mon Sep 17 00:00:00 2001 From: Charles PIGNEROL <> Date: Fri, 6 Dec 2024 07:51:12 +0100 Subject: [PATCH] Version 6.4.7. Removed support for python 2. --- cmake/version.cmake | 12 ++++++------ src/CMakeLists.txt | 17 ++++++----------- versions.txt | 6 ++++++ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/cmake/version.cmake b/cmake/version.cmake index b7f098d..3e1c545 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -2,15 +2,15 @@ # version.cmake : version du projet # -# Pour la bibliothèque QtPython : -set (QT_PYTHON_MAJOR_VERSION "6") -set (QT_PYTHON_MINOR_VERSION "4") -set (QT_PYTHON_RELEASE_VERSION "6") -set (QT_PYTHON_VERSION ${QT_PYTHON_MAJOR_VERSION}.${QT_PYTHON_MINOR_VERSION}.${QT_PYTHON_RELEASE_VERSION}) +# Pour la bibliothèque QtPython (obsolète, Python 2) : +#set (QT_PYTHON_MAJOR_VERSION "6") +#set (QT_PYTHON_MINOR_VERSION "4") +#set (QT_PYTHON_RELEASE_VERSION "7") +#set (QT_PYTHON_VERSION ${QT_PYTHON_MAJOR_VERSION}.${QT_PYTHON_MINOR_VERSION}.${QT_PYTHON_RELEASE_VERSION}) # Pour la bibliothèque QtPython3 : set (QT_PYTHON_3_MAJOR_VERSION "6") set (QT_PYTHON_3_MINOR_VERSION "4") -set (QT_PYTHON_3_RELEASE_VERSION "6") +set (QT_PYTHON_3_RELEASE_VERSION "7") set (QT_PYTHON_3_VERSION ${QT_PYTHON_3_MAJOR_VERSION}.${QT_PYTHON_3_MINOR_VERSION}.${QT_PYTHON_3_RELEASE_VERSION}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7162582..084d423 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,12 +1,7 @@ -if (USE_PYTHON_2) - add_subdirectory (QtPython) - if (BUILD_PY_CONSOLE) - add_subdirectory (QtPyConsole) # Bloque sur la partie moc en de rares circonstances - endif (BUILD_PY_CONSOLE) -else ( ) - add_subdirectory (QtPython3) - if (BUILD_PY_CONSOLE) - add_subdirectory (QtPyConsole3) # Bloque sur la partie moc en de rares circonstances - endif (BUILD_PY_CONSOLE) -endif (USE_PYTHON_3) +#add_subdirectory (QtPython) # Obsolète, python 2 +#add_subdirectory (QtPyConsole) # Obsolète, python 2. Bloque sur la partie moc en de rares circonstances +add_subdirectory (QtPython3) +if (BUILD_PY_CONSOLE) + add_subdirectory (QtPyConsole3) # Bloque sur la partie moc en de rares circonstances +endif (BUILD_PY_CONSOLE) diff --git a/versions.txt b/versions.txt index 10b9af3..03d2e88 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,9 @@ +Version 6.4.7 : 06/12/24 +=============== + +Arrêt support python 2. + + Version 6.4.6 : 29/11/24 ===============