Remove unused pubsub from nsis requirements, upgrade pynsist, clean u…

…p the nsi template.

irida-uploader.cfg

@@ -12,7 +12,6 @@ bitness=32
 packages = rauth
 	requests
 	requests_toolbelt
-	pubsub
 	appdirs
 	shutil
 	API

irida-uploader.nsi

@@ -1,159 +1,8 @@
-; This part of the file comes from pynsist https://raw.githubusercontent.com/takluyver/pynsist/2e0758e00f2ab0c29d5b2970a52a1ab5a1f0efb4/nsist/pyapp.nsi
-
-!define PRODUCT_NAME "[[ib.appname]]"
-!define PRODUCT_VERSION "[[ib.version]]"
-!define PY_VERSION "[[ib.py_version]]"
-!define PY_MAJOR_VERSION "[[ib.py_major_version]]"
-!define BITNESS "[[ib.py_bitness]]"
-!define ARCH_TAG "[[arch_tag]]"
-!define INSTALLER_NAME "[[ib.installer_name]]"
-!define PRODUCT_ICON "[[icon]]"
-
-SetCompressor lzma
-
-RequestExecutionLevel admin
-
-[% block modernui %]
-; Modern UI installer stuff 
-!include "MUI2.nsh"
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
-
-; UI pages
-[% block ui_pages %]
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-[% endblock ui_pages %]
-!insertmacro MUI_LANGUAGE "English"
-[% endblock modernui %]
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "${INSTALLER_NAME}"
-InstallDir "$PROGRAMFILES${BITNESS}\${PRODUCT_NAME}"
-ShowInstDetails show
-
-Section -SETTINGS
-  SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-SectionEnd
+[% extends "pyapp_w_pylauncher.nsi" %]
+; from nsis documentation: http://nsis.sourceforge.net/Auto-uninstall_old_before_installing_new
 
 [% block sections %]
-
-Section "!${PRODUCT_NAME}" sec_app
-  SectionIn RO
-  SetShellVarContext all
-  File ${PRODUCT_ICON}
-  SetOutPath "$INSTDIR\pkgs"
-  File /r "pkgs\*.*"
-  SetOutPath "$INSTDIR"
-
-  ; Install files
-  [% for destination, group in grouped_files %]
-    SetOutPath "[[destination]]"
-    [% for file in group %]
-      File "[[ file ]]"
-    [% endfor %]
-  [% endfor %]
-
-  ; Install directories
-  [% for dir, destination in ib.install_dirs %]
-    SetOutPath "[[ pjoin(destination, dir) ]]"
-    File /r "[[dir]]\*.*"
-  [% endfor %]
-
-  [% block install_shortcuts %]
-  ; Install shortcuts
-  ; The output path becomes the working directory for shortcuts
-  SetOutPath "%HOMEDRIVE%\%HOMEPATH%"
-  [% if single_shortcut %]
-    [% for scname, sc in ib.shortcuts.items() %]
-    CreateShortCut "$SMPROGRAMS\[[scname]].lnk" "[[sc['target'] ]]" \
-      '[[ sc['parameters'] ]]' "$INSTDIR\[[ sc['icon'] ]]"
-    [% endfor %]
-  [% else %]
-    [# Multiple shortcuts: create a directory for them #]
-    CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-    [% for scname, sc in ib.shortcuts.items() %]
-    CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\[[scname]].lnk" "[[sc['target'] ]]" \
-      '[[ sc['parameters'] ]]' "$INSTDIR\[[ sc['icon'] ]]"
-    [% endfor %]
-  [% endif %]
-  SetOutPath "$INSTDIR"
-  [% endblock install_shortcuts %]
-
-  ; Byte-compile Python files.
-  DetailPrint "Byte-compiling Python modules..."
-  nsExec::ExecToLog '[[ python ]] -m compileall -q "$INSTDIR\pkgs"'
-  WriteUninstaller $INSTDIR\uninstall.exe
-  ; Add ourselves to Add/remove programs
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
-                   "DisplayName" "${PRODUCT_NAME}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
-                   "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
-                   "InstallLocation" "$INSTDIR"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
-                   "DisplayIcon" "$INSTDIR\${PRODUCT_ICON}"
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
-                   "NoModify" 1
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
-                   "NoRepair" 1
-
-  ; Check if we need to reboot
-  IfRebootFlag 0 noreboot
-    MessageBox MB_YESNO "A reboot is required to finish the installation. Do you wish to reboot now?" \
-                /SD IDNO IDNO noreboot
-      Reboot
-  noreboot:
-SectionEnd
-
-Section "Uninstall"
-  SetShellVarContext all
-  Delete $INSTDIR\uninstall.exe
-  Delete "$INSTDIR\${PRODUCT_ICON}"
-  RMDir /r "$INSTDIR\pkgs"
-  ; Uninstall files
-  [% for file, destination in ib.install_files %]
-    Delete "[[pjoin(destination, file)]]"
-  [% endfor %]
-  ; Uninstall directories
-  [% for dir, destination in ib.install_dirs %]
-    RMDir /r "[[pjoin(destination, dir)]]"
-  [% endfor %]
-  [% block uninstall_shortcuts %]
-  ; Uninstall shortcuts
-  [% if single_shortcut %]
-    [% for scname in ib.shortcuts %]
-      Delete "$SMPROGRAMS\[[scname]].lnk"
-    [% endfor %]
-  [% else %]
-    RMDir /r "$SMPROGRAMS\${PRODUCT_NAME}"
-  [% endif %]
-  [% endblock uninstall_shortcuts %]
-  RMDir $INSTDIR
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-SectionEnd
-
-[% endblock sections %]
-
-; Functions
-
-Function .onMouseOverSection
-    ; Find which section the mouse is over, and set the corresponding description.
-    FindWindow $R0 "#32770" "" $HWNDPARENT
-    GetDlgItem $R0 $R0 1043 ; description item (must be added to the UI)
-
-    [% block mouseover_messages %]
-    StrCmp $0 ${sec_app} "" +2
-      SendMessage $R0 ${WM_SETTEXT} 0 "STR:${PRODUCT_NAME}"
-
-    [% endblock mouseover_messages %]
-FunctionEnd
-
-; This part of the file comes from nsis documentation: http://nsis.sourceforge.net/Auto-uninstall_old_before_installing_new
-
+[[ super() ]]
 Function .onInit
 
   ReadRegStr $R0 HKLM \
@@ -183,3 +32,5 @@ uninst:
 done:
 
 FunctionEnd
+
+[% endblock sections %]

requirements.txt

@@ -6,7 +6,7 @@ pep8==1.6.2
 requests==2.5.1
 requests-toolbelt==0.4.0
 appdirs==1.4.0
-pynsist==1.6
+pynsist==1.7
 Sphinx==1.3.1
 pytest
 github3.py==0.9.3