Add Python 3.13 to Windows installer, drop 3.7

salilab · Nov 4, 2024 · a8e9c5b · a8e9c5b
1 parent 98212aa
commit a8e9c5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,9 @@
 ChangeLog {#changelog}
 =========
 
+# HEAD
+- The Windows .exe installer now supports Python 3.8 through 3.13.
+
 # 2.21.0 - 2024-06-13 # {#changelog_2_21_0}
 - The new IMP::spatiotemporal module can be used to assist in building stepwise
   spatiotemporal models, such as those we used to compute our model of

diff --git a/tools/w32/make-package.sh b/tools/w32/make-package.sh
@@ -11,8 +11,8 @@
 # make DESTDIR=`pwd`/w32-inst install
 #
 # Where $w32py is the path containing Python headers and libraries.
-# Repeat for all desired Python versions (3.7, 3.8, 3.9, 3.10, 3.11,
-# and 3.12 for us)
+# Repeat for all desired Python versions (3.8, 3.9, 3.10, 3.11, 3.12,
+# and 3.13 for us)
 #
 # Then run (still in the binary directory)
 # <source_dir>/tools/w32/make-package.sh <version> <bits>
@@ -91,7 +91,7 @@ for app in ${ROOT}/bin/*; do
 done
 
 # Make Python version-specific directories for extensions (.pyd)
-PYVERS="3.7 3.8 3.9 3.10 3.11 3.12"
+PYVERS="3.8 3.9 3.10 3.11 3.12 3.13"
 for PYVER in ${PYVERS}; do
   mkdir ${ROOT}/python/python${PYVER} || exit 1
   mkdir ${ROOT}/python/python${PYVER}/_ihm_pyd || exit 1
@@ -119,7 +119,7 @@ rm -rf ${ROOT}/bin/imp_example_app.exe \
 # Remove any .svn directories
 rm -rf `find ${ROOT} -name .svn`
 
-PYVERS="36 37 38 39 310 311 312"
+PYVERS="38 39 310 311 312 313"
 if [ "${BITS}" = "32" ]; then
   MAKENSIS="makensis"
   DLLSRC=/usr/lib/w32comp/windows/system

diff --git a/tools/w32/w32-install.nsi b/tools/w32/w32-install.nsi
@@ -81,12 +81,12 @@ Section ""
   WriteRegDWORD HKLM "${UNINST_KEY}" "NoModify" 1
   WriteRegDWORD HKLM "${UNINST_KEY}" "NoRepair" 1
 
-  WriteRegStr HKLM "Software\Python\PythonCore\3.7${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
   WriteRegStr HKLM "Software\Python\PythonCore\3.8${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
   WriteRegStr HKLM "Software\Python\PythonCore\3.9${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
   WriteRegStr HKLM "Software\Python\PythonCore\3.10${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
   WriteRegStr HKLM "Software\Python\PythonCore\3.11${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
   WriteRegStr HKLM "Software\Python\PythonCore\3.12${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
+  WriteRegStr HKLM "Software\Python\PythonCore\3.13${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
 
   !insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODVER}
     CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
@@ -115,12 +115,12 @@ Section "Uninstall"
 
   DeleteRegKey /ifempty HKLM "Software\${PRODVER}"
   DeleteRegKey HKLM "${UNINST_KEY}"
-  DeleteRegKey HKLM "Software\Python\PythonCore\3.7${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
   DeleteRegKey HKLM "Software\Python\PythonCore\3.8${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
   DeleteRegKey HKLM "Software\Python\PythonCore\3.9${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
   DeleteRegKey HKLM "Software\Python\PythonCore\3.10${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
   DeleteRegKey HKLM "Software\Python\PythonCore\3.11${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
   DeleteRegKey HKLM "Software\Python\PythonCore\3.12${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
+  DeleteRegKey HKLM "Software\Python\PythonCore\3.13${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
 
 SectionEnd