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

Jupyter -> master #99

Merged
merged 143 commits into from Nov 24, 2016

Conversation

Projects
None yet
6 participants
@cgravill
Contributor

cgravill commented Nov 23, 2016

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

FilippoPolo and others added some commits Oct 20, 2015

Merge pull request #1 from npmurphy/filippo_fork
linux kernel spec paths corrected
Merge pull request #2 from npmurphy/merge_filippo_fork
update this branch with upstream commits
Merge pull request #3 from cgravill/master
Substitute in F# 3.1 for later versions
Merge pull request #58 from fsprojects/master
Merge Linux fixes from master (by luminescent)
Remove TypeProviders include version problems
#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.

cgravill and others added some commits Sep 24, 2016

Add a Paket.fsx script (#86)
* 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 (#91)
* 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 (#93)
* Update Dockerfile
Fix warnings (#94)
* Use new NetMQ interface
* Handle FSharpToolTipElement.SingleParameter
* Autogenerate binding redirects
* Pin XPlot.Plotly to prevent Newtonsoft.JSON conflicts
Update to 0.2.5 Angara Charting / XPlot 1.4.2
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 (#97)
* handle comm_info_request

* fix union type
Kernelspecs (#98)
* use kernelspecs path

* add semicolon

* do not replace the jupyter logo

* change the display name to F#
@sylvanc

This comment has been minimized.

Show comment
Hide comment
@sylvanc

sylvanc Nov 23, 2016

Contributor

Fantastic, thanks @cgravill

Contributor

sylvanc commented Nov 23, 2016

Fantastic, thanks @cgravill

@sylvanc sylvanc merged commit c58e339 into master Nov 24, 2016

@cgravill cgravill deleted the jupyter branch Dec 9, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment