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

Jupyter -> master #99

Merged
merged 143 commits into from
Nov 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
9612a03
Fixed IntelliSense and syntax highlighting
Oct 20, 2015
d401422
Added git-excluded files
Oct 20, 2015
98d8ce8
Added missing file
Oct 20, 2015
62c7162
Implemented message signing
Oct 20, 2015
af8b6a5
Proper handling of unsigned messages.
Oct 20, 2015
6db4242
linux kernel spec paths corrected
npmurphy Oct 20, 2015
199454f
merging with master
npmurphy Oct 20, 2015
ff83e69
remove old 0zmq comment
npmurphy Oct 20, 2015
57e845f
Merge pull request #1 from npmurphy/filippo_fork
FilippoPolo Oct 21, 2015
ccc7345
Merge pull request #2 from npmurphy/merge_filippo_fork
FilippoPolo Oct 21, 2015
491edf0
Fixed automerge mistake
Oct 21, 2015
41b93bf
Added InspectRequest dummy implementation
Oct 27, 2015
d134d24
Added dummy answer to inspect_request
Oct 27, 2015
1e7d25f
Wrapped logging in an exception handler
Oct 28, 2015
479c618
Added GenericChartsWithSize, for outputting multiple charts.
Oct 28, 2015
d91f800
Extending MultiplePlots to use different numbers of columns
ndalchau Oct 30, 2015
bfedd74
Reverting to packages version of FSharp.Charting.
ndalchau Nov 4, 2015
6f8b84d
Added the ability to prepare temporary files to serve.
Nov 4, 2015
6a9130f
Added some helpers to allow arranging multiple images in an output.
Nov 4, 2015
93dd982
Added SVG moving and merging functions.
Nov 5, 2015
2c4bf70
NuGet package installation will now copy content files to a "content"…
Nov 5, 2015
0ca6e27
Merge pull request #3 from cgravill/master
FilippoPolo Dec 2, 2015
e0637fa
Updated documentation file
Feb 5, 2016
f3a5263
Merging confilicted #51 with Jupyter support.
cgravill Feb 5, 2016
75e05e2
modified the FAKE script so it can build the project, add basic paket…
npmurphy Mar 24, 2016
c94942a
Merging confilicted #51 with Jupyter support.
cgravill Feb 5, 2016
2dd6142
Merge branch 'jupyter' of https://github.com/fsprojects/IfSharp into …
cgravill Apr 9, 2016
93c4396
Merge pull request #58 from fsprojects/master
cgravill Apr 9, 2016
af039dc
Remove TypeProviders include version problems
cgravill Apr 9, 2016
f37f06c
merge with master, get FAKE from Paket instead of nuget
npmurphy Apr 9, 2016
bb91aff
Merge pull request #56 from npmurphy/add_paket_for_build_script
cgravill Apr 9, 2016
411c3af
switch project to paket instead of Nuget
npmurphy Apr 9, 2016
eb71aa1
comment out the nuget restore from FAKE build script
npmurphy Apr 9, 2016
84ab56d
Merge branch 'jupyter' into switch_project_to_paket
npmurphy Apr 9, 2016
598d799
build.sh restores packages now
npmurphy Apr 9, 2016
90a1c6f
add initial files for setting up packet in the ifsharp bin directory …
npmurphy Apr 10, 2016
e15ae81
Merge pull request #60 from npmurphy/remove_nuget_from_build
cgravill Apr 12, 2016
273b828
Switch to using Paket matches #59
cgravill Apr 12, 2016
77a43aa
forgot to add references
npmurphy Apr 12, 2016
4da979c
fix merge
npmurphy Apr 12, 2016
50d9a10
Enabled Paket auto restore - VS experience
cgravill Apr 12, 2016
c4fee46
Merge pull request #4 from fsprojects/paket_autorestore
npmurphy Apr 12, 2016
0122104
Merge pull request #59 from npmurphy/switch_project_to_paket
cgravill Apr 12, 2016
c54695d
merge with jupyter branch
npmurphy Apr 12, 2016
6dbbe26
updated fsproj
npmurphy Apr 12, 2016
20b8f4b
Minimal xUnit test (avoid spurious errors)
cgravill Apr 12, 2016
5e95fe5
Merge branch 'jupyter' into xplot
npmurphy Apr 17, 2016
33dabee
change helpers to be an ItemGroup, copy all the directory on build, p…
npmurphy Apr 17, 2016
11406b4
Corrected handling of ZeroMQ identities.
May 5, 2016
80c1e77
Upgrade the FCS due to crash on start
cgravill May 5, 2016
bc1d292
Merge pull request #5 from fsprojects/pr/61
npmurphy May 5, 2016
581a611
Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…
npmurphy May 5, 2016
c023cfc
merge
npmurphy May 5, 2016
8322f6f
Upgrading FSharp.Charting to latest version
ndalchau May 5, 2016
b67505d
move the copying of the helper scripts to Console project. make build…
npmurphy May 5, 2016
f2c3251
Merge branch 'xplot' into fscharting_ripout
npmurphy May 5, 2016
5da2eb6
manual merge of readme file
May 6, 2016
245760e
Merge branch 'fsprojects-master'
May 6, 2016
a820062
Merge pull request #61 from npmurphy/xplot
cgravill May 6, 2016
52a04ce
Merged with fsprojects jupyter
May 6, 2016
434ee40
Further merge from fsprojects/jupyter
May 6, 2016
2595f7c
fixed merge mistake
May 6, 2016
ed8a6e9
Merge pull request #64 from FilippoPolo/master
cgravill May 6, 2016
b863186
merge with jupyter branch
npmurphy May 6, 2016
9e9f588
Removed leftover "data", allow multiple outputs
cgravill May 14, 2016
2957814
Proof of concept: show types
cgravill May 17, 2016
590cdaf
Manual merge
May 31, 2016
b26eeae
Merge branch 'fsprojects-master'
May 31, 2016
e8e263e
Manual merge
May 31, 2016
e7e1866
Downgraded NetMQ to 3.3.0.11
May 31, 2016
3e9b9cd
Merge pull request #7 from fsprojects/jupyter
FilippoPolo May 31, 2016
8da820b
added Dockerfile and updated readme
May 31, 2016
b5ff1c3
fix readme typo
May 31, 2016
1afa5da
Update README.md
cgravill May 31, 2016
714aa0d
Update README.md
cgravill May 31, 2016
b655972
Update README.md
cgravill May 31, 2016
14ac81d
Identify OSX and use right directory
May 31, 2016
ad8f2dd
Linux documents
npmurphy May 31, 2016
df31740
Update README.md
npmurphy May 31, 2016
d5aca55
Merge pull request #72 from npmurphy/doc_update
cgravill May 31, 2016
71ccb8c
Update README.md
cgravill May 31, 2016
b5d180a
Merge remote-tracking branch 'origin/jupyter' into display-types
cgravill Jun 1, 2016
5a7b53b
Factored out directives, allow turning off types
cgravill Jun 1, 2016
2a891a8
Project file change
cgravill Jun 1, 2016
6c4d2fa
Manual merge of readme.md
Jun 9, 2016
d14efff
Merge pull request #75 from fsprojects/pr/74
cgravill Jun 9, 2016
8db9283
Merge pull request #8 from fsprojects/jupyter
FilippoPolo Jul 7, 2016
a80c7d9
Switch to F# logo (top right)
cgravill Jul 8, 2016
193bb5a
Update console information
cgravill Jul 8, 2016
9e2df38
Installer now checks for all files.
Jul 11, 2016
56516a2
Don't rely on ipython_config.py
cgravill Jul 14, 2016
4d85441
Replaced links to static in kernel.js with links to kernelspecs.
Jul 18, 2016
d3ccf71
Manual merge from Colin's changes
Jul 20, 2016
405adb4
Merge branch 'fsprojects-jupyter'
Jul 20, 2016
a31dd97
Restored NetMQ 3.3.3.1
Jul 20, 2016
4dcc5f4
Merge pull request #73 from fsprojects/display-types
cgravill Jul 21, 2016
f57b3a7
Merge pull request #80 from FilippoPolo/master
cgravill Jul 22, 2016
5444fca
Point to alpha2
cgravill Aug 3, 2016
5d63b98
Update docker to alpha2
cgravill Sep 1, 2016
eaf94b1
Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65
cgravill Sep 1, 2016
01704a9
Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65
cgravill Sep 1, 2016
03c1e84
Use Paket.Core.dll to get dependencies on install
cgravill Sep 1, 2016
07b1f27
Merge pull request #6 from fsprojects/pr/65
npmurphy Sep 6, 2016
be6c8f6
Finish up FSCharting hard dependency removal
cgravill Sep 7, 2016
cfda359
Note about include
cgravill Sep 7, 2016
f2f65d3
Merge pull request #65 from npmurphy/fscharting_ripout
cgravill Sep 7, 2016
5660324
Merge pull request #82 from fsprojects/pr/65
cgravill Sep 7, 2016
80dbc36
Point to local Feature Notebook
cgravill Sep 7, 2016
9258594
Update README.md
cgravill Sep 7, 2016
43ecca8
Pin dependencies for more predictable install
cgravill Sep 7, 2016
c57b270
Update Paket.Core.dll
cgravill Sep 9, 2016
6392c54
Paket should install to distribution directory
cgravill Sep 9, 2016
1115038
Mitigation for Paket.Core install issue
cgravill Sep 12, 2016
7296eab
Add required references to build test project
cgravill Sep 14, 2016
5e8d1e3
Auto-Initialise XPlotly.Plotly.fsx and FSCharting.fsx (#84)
sylvanc Sep 19, 2016
14f3fc1
Install option (#87)
sylvanc Sep 20, 2016
94b4157
Update Json.NET and fix for Chessie
cgravill Sep 24, 2016
505f45c
We're no longer using these binaries in \lib
cgravill Sep 24, 2016
519991d
Update F# Compiler Services
cgravill Sep 24, 2016
31ef5c0
Simplify dependencies
cgravill Sep 24, 2016
c3815ea
Update sigdata and optdata to F# 4.0
cgravill Sep 24, 2016
b5dd271
Add a Paket.fsx script (#86)
sylvanc Sep 26, 2016
8de53f0
Add options for PNG and SVG output of Plot.ly charts (#88)
sylvanc Sep 27, 2016
9b0aba4
Add helper script support for Angara.Charting (#89)
sylvanc Sep 28, 2016
b63ab00
This is fixed by upgrading Json.net
cgravill Sep 29, 2016
8e54a6d
Coherent net451 framework usage
cgravill Sep 29, 2016
ef048ef
Update README.md
cgravill Sep 29, 2016
fa9a312
Sample Jupyter feature notebook
cgravill Sep 29, 2016
60ff533
Paket based dependencies (#91)
sylvanc Oct 3, 2016
c5646dc
Update dependencies and pin to AsyncIO 0.1.20.0 for NetMQ (#92)
sylvanc Oct 17, 2016
3f41d19
Update Dockerfile (#93)
sylvanc Oct 18, 2016
7a7e767
Fix warnings (#94)
sylvanc Oct 18, 2016
9a4a3e1
Update to 0.2.5 Angara Charting / XPlot 1.4.2
cgravill Oct 25, 2016
139fd6f
Add support for FsLab-compatible AddHtmlPrinter (#96)
tpetricek Nov 1, 2016
6823ddd
handle comm_info_request
sylvanc Nov 14, 2016
9551cdb
fix union type
sylvanc Nov 14, 2016
2fb037e
handle comm_info_request (#97)
sylvanc Nov 14, 2016
10a917b
Point to alpha4 release fixes Jupyter 4.2 issue
cgravill Nov 15, 2016
30c86e5
Fix link to alpha4
cgravill Nov 15, 2016
2839ab3
Update README.md
cgravill Nov 15, 2016
8d700a8
Update README.md
cgravill Nov 15, 2016
beaf05e
Kernelspecs (#98)
sylvanc Nov 17, 2016
7bd2823
Update installer to get everything in bin
cgravill Nov 18, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

.vs/

# User-specific files
*.suo
*.user
Expand Down Expand Up @@ -158,6 +160,9 @@ $RECYCLE.BIN/
# Exclude F# project specific directories and files
# ===================================================

# FAKE directory
.fake/

# NuGet Packages Directory
packages/

Expand All @@ -169,3 +174,5 @@ temp/

# Test results produced by build
TestResults.xml
.paket/paket.exe

136 changes: 0 additions & 136 deletions .nuget/NuGet.targets

This file was deleted.

Binary file added .paket/paket.bootstrapper.exe
Binary file not shown.
41 changes: 41 additions & 0 deletions .paket/paket.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Enable the restore command to run before builds -->
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
<!-- Download Paket.exe if it does not already exist -->
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
</PropertyGroup>
<PropertyGroup>
<!-- Paket command -->
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
<!-- Commands -->
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
<PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
<!-- We need to ensure packages are restored prior to assembly resolve -->
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
</PropertyGroup>
<Target Name="CheckPrerequisites">
<!-- Raise an error if we're unable to locate paket.exe -->
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
</Target>
<Target Name="DownloadPaket">
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
</Target>
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
</Target>
</Project>
38 changes: 38 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM ubuntu:16.04

RUN apt-key adv \
--keyserver hkp://keyserver.ubuntu.com:80 \
--recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
&& echo "deb http://download.mono-project.com/repo/debian wheezy main" | \
tee /etc/apt/sources.list.d/mono-xamarin.list \
&& apt-get update \
&& apt-get install -y \
mono-complete \
fsharp \
python3-pip \
git \
&& rm -rf /var/lib/apt/lists/*

RUN pip3 install --upgrade pip && pip3 install jupyter

WORKDIR /
RUN git clone https://github.com/fsprojects/IfSharp.git

WORKDIR /IfSharp
RUN git checkout jupyter
RUN ./build.sh
RUN mono bin/ifsharp.exe --install

WORKDIR /
RUN mkdir notebooks
VOLUME notebooks

EXPOSE 8888

ENTRYPOINT ["jupyter", \
"notebook", \
"--no-browser", \
"--ip='*'", \
"--port=8888", \
"--notebook-dir=/notebooks" \
]
Loading