Merge pull request winpython#155 from stonebig/master

stonebig · stonebig · commit 18d78b62ddde · 2015-08-18T23:45:24.000+02:00
qtconsole-4.0.1 removes this workaround need
diff --git a/make.py b/make.py
@@ -551,14 +551,11 @@ def _create_launchers(self):
 
 
         if osp.isfile(osp.join(self.python_dir, 'Scripts', 'jupyter.exe')):
-            #self.create_launcher('IPython Qt Console.exe', 'ipython.ico',
-            #                     command='${WINPYDIR}\python.exe',
-            #                     args='${WINPYDIR}\Scripts\jupyter-qtconsole',
-            #                     workdir=r'${WINPYDIR}\..\notebooks')
             self.create_launcher('IPython Qt Console.exe', 'ipython.ico',
-                             command='$SYSDIR\cmd.exe',
-                             args=r'/k jupyter_start_qtconsole.bat',
-                             workdir=r'${WINPYDIR}\..\Scripts')
+                                 command='${WINPYDIR}\Scripts\%s' %
+                                         'jupyter-qtconsole.exe',
+                                 workdir=r'${WINPYDIR}\..\notebooks')
+
             self.create_launcher('Jupyter Notebook.exe', 'jupyter.ico',
                                  command='${WINPYDIR}\Scripts\%s' %
                                          'jupyter-notebook.exe',
@@ -687,14 +684,6 @@ def _create_batch_scripts(self):
         self.create_python_batch('pyqt5_demo.bat', 'qtdemo.pyw',
              workdir=r'Lib\site-packages\PyQt5\examples\qtdemo')
 
-        #workaround for Jupyter-qtconsole
-        self.create_batch_script('jupyter_start_qtconsole.bat', r"""@echo off
-call %~dp0env.bat
-cd /D %WINPYDIR%\..\notebooks
-%WINPYDIR%\python.exe  -c "from qtconsole.qtconsoleapp import main;main()"
-        """)
-
-
 
         # pre-run mingw batch
         print('now pre-running extra mingw')
