Switch to Python 3.9

Author: uglide

3rdparty/pyotherside.pri

@@ -1,34 +1,35 @@
 
 # Python
+PY_VERSION="39"
+PY_LIB_SUFFIX="3.9"
+
 win32* {
-    QMAKE_LIBS += -LC:\Python37-x64\libs -lpython37
-    INCLUDEPATH += C:\Python37-x64\include\
+    QMAKE_LIBS += -LC:\Python$${PY_VERSION}-x64\libs -lpython$${PY_VERSION}
+    INCLUDEPATH += C:\Python$${PY_VERSION}-x64\include\
 } else {
     unix:macx {
       exists($$PWD/python-3) {
         message("Using Python from 3rdparty dir")
-        LIBS += $$PWD/python-3/lib/libpython3.7m.dylib
-        INCLUDEPATH += $$PWD/python-3/include/python3.7m
+        LIBS += $$PWD/python-3/lib/libpython$${PY_LIB_SUFFIX}.dylib
+        INCLUDEPATH += $$PWD/python-3/include/python$${PY_LIB_SUFFIX}
 
         #deployment
-        PY_DATA_FILES.files = $$PWD/python-3/lib/libpython3.7m.dylib
+        PY_DATA_FILES.files = $$PWD/python-3/lib/libpython$${PY_LIB_SUFFIX}.dylib
         PY_DATA_FILES.path = Contents/Frameworks
         QMAKE_BUNDLE_DATA += PY_DATA_FILES
 
       } else {
        PYTHON_CONFIG = /usr/local/bin/python3-config
-       QMAKE_LIBS += $$system($$PYTHON_CONFIG --ldflags --libs)
+       QMAKE_LIBS += $$system($$PYTHON_CONFIG --ldflags --libs --embed)
        QMAKE_CXXFLAGS += $$system($$PYTHON_CONFIG --includes)
       }
     } else {
       PYTHON_CONFIG = python3-config
 
       PYTHON_VERSION = $$str_member($$system(python3 --version), 7, 11)
-
       message("Python version $$PYTHON_VERSION")
 
-      versionAtLeast(PYTHON_VERSION, "3.8.0") {
-        message("Python >=3.8 needs --embed flag")
+      versionAtLeast(PYTHON_VERSION, "3.8.0") {        
         QMAKE_LIBS += $$system($$PYTHON_CONFIG --ldflags --libs --embed)
       } else {
         QMAKE_LIBS += $$system($$PYTHON_CONFIG --ldflags --libs)

docs/install.md

@@ -69,7 +69,7 @@ cd 3rdparty/lz4/build/cmake
 cmake -DLZ4_BUNDLED_MODE=ON  .
 make
 ```
-6. Install Python 3.7 amd64 to `C:\Python37-x64`.
+6. Install Python 3.9 amd64 to `C:\Python39-x64`.
 7. Install Python requirements `pip3 install -r src/py/requirements.txt`.
 8. Open `./src/rdm.pro` in **Qt Creator**.  Choose the `Desktop Qt 5.15.x MSVC2019 64bit > Release` build profile.
 9. Run build. (Just hit `Ctrl-B`)