Jupyter -> master #99
Merged
Conversation
This file contains hidden or 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
linux kernel spec paths corrected
update this branch with upstream commits
… folder inside the notebook's folder.
Substitute in F# 3.1 for later versions
Merge Linux fixes from master (by luminescent)
#53 We can access this via NuGet now i.e. #N "FSharp.Data.TypeProviders" Including a specific version is causing problems with VS2015 and Linux installs.
Old version of Json.NET was a holdover from NuGet dependencies.
Remove for clarity.
* Add a Paket.fsx script This script loads `Paket.Core.dll` and sets up a `paket` object that is an instance of `Paket.Dependencies` that is initialised from `bin/paket.dependencies`. This allows simple use of Pajet from jupyter, like this: ```fsharp paket.GetDirectDependencies() ``` * provide convenience syntax for adding deps * remove accidental nested module
* Paket based dependencies Rather than depend on a fixed set of packages, use Paket to fetch all dependencies dynamically. Helper scripts are divided into two parts to allow Paket to run _before_ the `#r` directives in the second script are evaluated. This is necessary because preprocessor directives are evaluated before all code, and this appears to be transitive through `#load` directives - that is, a wrapper scripts that loads both the Paket script and the helper script also evaluates the `#r` directives in the second script before code in the first script is run. * Update documentation for Jupyter branch This includes docs for Paket rather than Nuget, installation procedure, etc. In addition, this changes the Paket dependencies for building IfSharp to use a Docs group to prevent an FSharp.Compiler.Service conflict.
* Update Dockerfile
* Use new NetMQ interface * Handle FSharpToolTipElement.SingleParameter * Autogenerate binding redirects * Pin XPlot.Plotly to prevent Newtonsoft.JSON conflicts
XPlot 1.4.2 requires Newtonsoft.Json 9.0.1 where Angara needed <= 9.0.0. Angara has now been updated so we can use both at the same time. microsoft/Angara#2
* handle comm_info_request * fix union type
* use kernelspecs path * add semicolon * do not replace the jupyter logo * change the display name to F#
|
Fantastic, thanks @cgravill |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Many changes to support upgrades from the ipython notebook system up to Jupyter 4.2.
Thanks for many contributors we've also made major functionality improvements including: strong support for Paket, many more charting options (XPlot, Angara), allow upgrading of F# charting by users, cross-platform support on at least Linux and MacOS, Docker containers, image composition helpers, type displays, F# 4.0, more reliable installs, improvements from F# compiler services, BigDeedle...
I've archived the ipython master for posterity and support if anyone needs it to here:
https://github.com/fsprojects/IfSharp/tree/ipython-archive