-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Windows qtconsole without cmd window #3
Open
tianfudhe
wants to merge
3
commits into
hyperspy:main
Choose a base branch
from
tianfudhe:master
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,16 @@ | |
import _winreg as winreg | ||
from win32com.shell import shell | ||
|
||
PYTHON_PATH = os.environ[ | ||
"WINPYDIR"] if "WINPYDIR" in os.environ else sys.prefix | ||
WPSCRIPTS_FOLDER = "Scripts" | ||
QTCONSOLE_SCRIPT = """from qtconsole.qtconsoleapp import main | ||
|
||
|
||
if __name__ == '__main__': | ||
main() | ||
""" | ||
|
||
|
||
def remove_jupyter_here(): | ||
for env in ('qtconsole', 'notebook'): | ||
|
@@ -47,6 +56,9 @@ def remove_jupyter_here(): | |
winreg.HKEY_CLASSES_ROOT, | ||
r'Directory\Background\shell\jupyter_%s_here' % | ||
env) | ||
# remove sjc-jupyter-qtconsole-script.py when un-installing | ||
os.remove(os.path.join(PYTHON_PATH, 'Scripts', | ||
'sjc-jupyter-qtconsole-script.py')) | ||
print("Jupyter %s here context menu entry removed." % env) | ||
except: | ||
# If this fails it is because it was not installed, so nothing to | ||
|
@@ -60,17 +72,26 @@ def add_jupyter_here(): | |
os.path.dirname(__file__), 'icons')) | ||
logos = {'qtconsole': os.path.join(logo_path, 'jupyter-qtconsole.ico'), | ||
'notebook': os.path.join(logo_path, 'jupyter.ico')} | ||
|
||
# Here I need to create a script for pythonw | ||
scr_fw = open(os.path.join(PYTHON_PATH, 'Scripts', | ||
'sjc-jupyter-qtconsole-script.py'), 'w') | ||
scr_fw.write(QTCONSOLE_SCRIPT) | ||
scr_fw.close() | ||
|
||
for env in ('qtconsole', 'notebook'): | ||
if "WINPYDIR" in os.environ: | ||
# Calling from WinPython | ||
# Paths are relative, so we have to set the env first | ||
script = os.path.join(os.environ["WINPYDIR"], "..", | ||
WPSCRIPTS_FOLDER, | ||
"env.bat") | ||
script += " & jupyter-%s" % env | ||
if env == 'notebook': | ||
if "WINPYDIR" in os.environ: | ||
# Calling from WinPython | ||
# Paths are relative, so we have to set the env first | ||
script = os.path.join( | ||
PYTHON_PATH, "..", WPSCRIPTS_FOLDER, "env.bat") + " & jupyter-notebook" | ||
else: | ||
script = os.path.join( | ||
PYTHON_PATH, 'Scripts', 'jupyter-notebook.exe') | ||
else: | ||
script = os.path.join( | ||
sys.prefix, 'Scripts', "jupyter-%s.exe" % env) | ||
script = os.path.join(PYTHON_PATH, 'pythonw.exe') + ' ' + os.path.join( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When working from WinPython we should first call the |
||
PYTHON_PATH, 'Scripts', 'sjc-jupyter-qtconsole-script.py') | ||
|
||
shell_script = script + ' --notebook-dir "%1"' if env == "notebook"\ | ||
else script | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you create the
sjc-jupyter-qtconsole-script.py
to start the qtconsole instead of using the identical one that ships with qtconsole?