Skip to content

Commit

Permalink
Add Python 3.8 support
Browse files Browse the repository at this point in the history
  • Loading branch information
benmwebb committed Oct 19, 2019
1 parent f88b987 commit 65d912f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ ChangeLog {#changelog}
=========

# HEAD
- The Windows .exe installer now supports Python 3.8, and has dropped support
for Python 3.4.
- The old IMP::pmi::representation::Representation class has been removed
from IMP.pmi. New applications should use IMP::pmi::topology::System instead.
- The IMP::pmi::restraints::crosslinking::ISDCrossLinkMS class for handling
Expand Down
8 changes: 4 additions & 4 deletions tools/w32/make-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# make DESTDIR=`pwd`/w32-inst install
#
# Where $w32py is the path containing Python headers and libraries.
# Repeat for all desired Python versions (2.7, 3.4, 3.5, 3.6, and 3.7 for us)
# Repeat for all desired Python versions (2.7, 3.5, 3.6, 3.7, and 3.8 for us)
#
# Then run (still in the binary directory)
# <source_dir>/tools/w32/make-package.sh <version> <bits>
Expand Down Expand Up @@ -79,7 +79,7 @@ for app in ${ROOT}/bin/*; do
done

# Make Python version-specific directories for extensions (.pyd)
PYVERS="2.7 3.4 3.5 3.6 3.7"
PYVERS="2.7 3.5 3.6 3.7 3.8"
for PYVER in ${PYVERS}; do
mkdir ${ROOT}/python/python${PYVER} || exit 1
mkdir ${ROOT}/python/python${PYVER}/_ihm_pyd || exit 1
Expand Down Expand Up @@ -110,7 +110,7 @@ rm -rf ${ROOT}/bin/example \
rm -rf `find ${ROOT} -name .svn`

if [ "${BITS}" = "32" ]; then
PYVERS="27 34 35 36 37"
PYVERS="27 35 36 37 38"
MAKENSIS="makensis"
# Add redist MSVC runtime DLLs
DLLSRC=/usr/lib/w32comp/windows/system
Expand All @@ -137,7 +137,7 @@ if [ "${BITS}" = "32" ]; then
${DLLSRC}/opencv_ffmpeg220.dll \
${DLLSRC}/opencv_imgproc220.dll ${ROOT}/bin || exit 1
else
PYVERS="27 34 35 36 37"
PYVERS="27 35 36 37 38"
MAKENSIS="makensis -DIMP_64BIT"
# Add redist MSVC runtime DLLs
DLLSRC=/usr/lib/w64comp/windows/system32
Expand Down
2 changes: 1 addition & 1 deletion tools/w32/pkg-README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ so can be run simply by opening a Command Prompt, changing to this bin
directory (or adding it to your PATH), and typing 'foxs'.

The IMP Python libraries are automatically set up to work with Python 2.7,
3.4, 3.5, 3.6, or 3.7. (You need to download Python separately from
3.5, 3.6, 3.7, or 3.8. (You need to download Python separately from
www.python.org and install it; be sure to get the 64-bit version of Python
if you installed the 64-bit version of IMP, and likewise for the 32-bit
version - you can't mix and match.)
Expand Down
4 changes: 2 additions & 2 deletions tools/w32/w32-install.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ Section ""
WriteRegDWORD HKLM "${UNINST_KEY}" "NoRepair" 1

WriteRegStr HKLM "Software\Python\PythonCore\2.7\PythonPath\${PRODVER}" "" "$INSTDIR\python"
WriteRegStr HKLM "Software\Python\PythonCore\3.4\PythonPath\${PRODVER}" "" "$INSTDIR\python"
WriteRegStr HKLM "Software\Python\PythonCore\3.5${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
WriteRegStr HKLM "Software\Python\PythonCore\3.6${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}" "" "$INSTDIR\python"
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"

!insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODVER}
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
Expand Down Expand Up @@ -115,10 +115,10 @@ Section "Uninstall"
DeleteRegKey /ifempty HKLM "Software\${PRODVER}"
DeleteRegKey HKLM "${UNINST_KEY}"
DeleteRegKey HKLM "Software\Python\PythonCore\2.7\PythonPath\${PRODVER}"
DeleteRegKey HKLM "Software\Python\PythonCore\3.4\PythonPath\${PRODVER}"
DeleteRegKey HKLM "Software\Python\PythonCore\3.5${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
DeleteRegKey HKLM "Software\Python\PythonCore\3.6${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
DeleteRegKey HKLM "Software\Python\PythonCore\3.7${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"
DeleteRegKey HKLM "Software\Python\PythonCore\3.8${PYTHON_ARCH_SUFFIX}\PythonPath\${PRODVER}"

SectionEnd

Expand Down

0 comments on commit 65d912f

Please sign in to comment.