v10.7 = remove NSIS installer (still keep icons creation option)

stonebig · stonebig · commit fa88f7145ad0 · 2024-09-08T12:40:10.000+02:00
diff --git a/README.rst b/README.rst
@@ -35,7 +35,7 @@ Dependencies
 Requirements
 ------------
 
-* installer can be NSIS, 7-Zip, or nothing
+* installer can be 7-Zip or nothing (just .zip-it)
 
 
 Installation
diff --git a/make.py b/make.py
@@ -75,7 +75,7 @@ def get_7zip_exe():
                 if Path(exe).is_file():
                     return exe
     else:
-        raise RuntimeError("NSIS is not installed on this computer.")
+        raise RuntimeError("7ZIP is not installed on this computer.")
 
 
 def replace_in_nsis_file(fname, data):
@@ -564,27 +564,6 @@ def create_python_batch(
             + " %*",
         )
 
-    def create_installer(self):
-        """Create installer with NSIS"""
-        self._print("Creating WinPython installer")
-        portable_dir = str(Path(__file__).resolve().parent / "portable")
-        fname = str(Path(portable_dir) / "installer-tmp.nsi")
-        data = (
-            ("DISTDIR", self.winpydir),
-            ("ARCH", self.winpy_arch),
-            (
-                "VERSION",
-                f"{self.python_fullversion}.{self.build_number}{self.flavor}",
-            ),
-            (
-                "VERSION_INSTALL",
-                f'{self.python_fullversion.replace(".", "")}' + f"{self.build_number}",
-            ),
-            ("RELEASELEVEL", self.release_level),
-        )
-        build_nsis("installer.nsi", fname, data)
-        self._print_done()
-
 
     def create_installer_7zip(self, installer_option=""):
         """Create installer with 7-ZIP"""
@@ -1899,8 +1878,6 @@ def make_all(
     )
     #          ,find_links=osp.join(basedir, 'packages.srcreq'))
     if str(create_installer).lower() != "false" and not simulation:
-        if "nsis" in str(create_installer).lower():
-            dist.create_installer()  # NSIS installer (can't handle big build)
         if "7zip" in str(create_installer).lower():
             dist.create_installer_7zip(".exe")  # 7-zip (no licence splash screen)
         if ".7z" in str(create_installer).lower():
diff --git a/portable/installer.nsi b/portable/installer.nsi
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '10.6.20240908'
+__version__ = '10.7.20240908'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
