Skip to content
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

[WIP] Use Conda.jl if Ipython/jupyter is not found #357

Merged
merged 2 commits into from
Sep 22, 2015

Conversation

dhoegh
Copy link
Contributor

@dhoegh dhoegh commented Sep 13, 2015

This is the first working version of an integrated IPython setup on all platforms.

  • Make build.jl can detect a JUPYTER environment variable
  • The Juptyer path should be output to a const jupyter = "..." in a IJulia/deps/deps.jl file that is generated during Pkg.build, and is included from IJulia.jl

@@ -2,4 +2,4 @@ julia 0.3
Nettle
JSON 0.2
ZMQ 0.1
Compat 0.7
Compat 0.7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

dhoegh added a commit to dhoegh/Conda.jl that referenced this pull request Sep 16, 2015
dhoegh added a commit to dhoegh/Conda.jl that referenced this pull request Sep 16, 2015
dhoegh added a commit to dhoegh/Conda.jl that referenced this pull request Sep 16, 2015
dhoegh added a commit to dhoegh/Conda.jl that referenced this pull request Sep 17, 2015
dhoegh added a commit to dhoegh/Conda.jl that referenced this pull request Sep 17, 2015
dhoegh added a commit to dhoegh/Conda.jl that referenced this pull request Sep 17, 2015
Luthaf pushed a commit to JuliaPy/Conda.jl that referenced this pull request Sep 18, 2015
@dhoegh
Copy link
Contributor Author

dhoegh commented Sep 21, 2015

I have updated the pull to a working condition. It do only work on master of Conda.jl. @Luthaf maybe you could tag a new version? While getting this to work I bumped into jupyter/notebook#448. I have added a workaround for the issue.

@dhoegh dhoegh changed the title [WIP] Use Conda.jl as default python distribution [WIP] Use Conda.jl if Ipython/jupyter is not found Sep 21, 2015
@@ -3,3 +3,4 @@ Nettle
JSON 0.2
ZMQ 0.1
Compat 0.7
Conda
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(please end the file with a newline)

@Luthaf
Copy link

Luthaf commented Sep 21, 2015

@Luthaf maybe you could tag a new version?

See JuliaLang/METADATA.jl#3488

@dhoegh dhoegh force-pushed the Use_Conda branch 2 times, most recently from 7ba87a9 to 52c00d6 Compare September 22, 2015 05:35
@dhoegh
Copy link
Contributor Author

dhoegh commented Sep 22, 2015

I have pushed a new version that fixes the workaround when IPython3 is used and the new lines.

# Remove the commit that added this when https://github.com/jupyter/notebook/issues/448 is closed
run(`$jupyter-kernelspec install --replace --user $juliakspec`)
else
run(`$jupyter-kernelspec install --replace --user $juliakspec`)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be $jupyter kernelspec?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is.

@@ -78,4 +96,16 @@ copy_config("logo-32x32.png", juliakspec)
copy_config("logo-64x64.png", juliakspec)

eprintln("Installing julia kernelspec $spec_name")
run(`$jupyter kernelspec install --replace --user $juliakspec`)
if basename(jupyter) == "jupyter"
# Remove the commit that added this when https://github.com/jupyter/notebook/issues/448 is closed
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just say # Just use "$jupyter kernelspec" when jupyter/notebook#448 is resolved and widely available. I don't think I want to bother with a separate commit for this.

@stevengj
Copy link
Member

Looking good. Can you squash the commits?

@stevengj
Copy link
Member

Oh nevermind, I guess we can leave it as two commits.

stevengj added a commit that referenced this pull request Sep 22, 2015
[WIP] Use Conda.jl if Ipython/jupyter is not found
@stevengj stevengj merged commit 87d9f80 into JuliaLang:master Sep 22, 2015
@dhoegh
Copy link
Contributor Author

dhoegh commented Sep 22, 2015

Thank you for merging. The readme should probably be updated and close #199 and #211.

@stevengj
Copy link
Member

Yup, updating the README now.

stevengj added a commit that referenced this pull request Sep 22, 2015
@tkelman
Copy link
Contributor

tkelman commented Sep 22, 2015

👏 🎆

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants