-
Notifications
You must be signed in to change notification settings - Fork 391
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
Add support for C# and F# #429
Merged
Merged
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
517846a
Version 1.3.3+dev
mwouts 0a321d7
Add C# notebook example
mwouts 3cac25e
Add F# notebook example
mwouts 3673923
Add support for C# and F# languages
mwouts aa9bba2
Text representations of the C# and F# example notebooks
mwouts fbf0ee9
C# and F# added to the list of supported languages
mwouts f520126
Default script extension for F# notebooks is .fsx
mwouts 0d1d105
Preserve dotnet/try metadata
mwouts 928e902
Magic commands in C# start with #!
mwouts 8779464
Python 3.5 does not have f-strings
mwouts a63a81c
Preserve the main_language information
mwouts 575dd87
Fix round trip on HTML/C# cells
mwouts 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
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
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
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 |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| """Jupytext's version number""" | ||
|
|
||
| __version__ = '1.3.3' | ||
| __version__ = '1.3.3+dev' |
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 |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| { | ||
| "cells": [ | ||
| { | ||
| "cell_type": "markdown", | ||
| "metadata": {}, | ||
| "source": [ | ||
| "We start with..." | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": 1, | ||
| "metadata": {}, | ||
| "outputs": [ | ||
| { | ||
| "name": "stdout", | ||
| "output_type": "stream", | ||
| "text": [ | ||
| "Hello World!\r\n" | ||
| ] | ||
| } | ||
| ], | ||
| "source": [ | ||
| "Console.WriteLine(\"Hello World!\");" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "markdown", | ||
| "metadata": {}, | ||
| "source": [ | ||
| "Then we do a plot with Plotly, following the [Plotting with XPlot](https://github.com/dotnet/interactive/blob/master/NotebookExamples/csharp/Docs/Plotting%20with%20Xplot.ipynb) example from `dotnet/interactive`:" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": 2, | ||
| "metadata": {}, | ||
| "outputs": [ | ||
| { | ||
| "data": { | ||
| "text/html": [ | ||
| "<div id=\"9a70b50f-ec94-4c20-8fa8-e14290eb0440\" style=\"width: 900px; height: 500px;\"></div>\r\n", | ||
| "<script type=\"text/javascript\">\r\n", | ||
| "\r\n", | ||
| "var renderPlotly = function() {\r\n", | ||
| " var xplotRequire = requirejs.config({context:'xplot-3.0.1',paths:{plotly:'https://cdn.plot.ly/plotly-1.49.2.min'}});\r\n", | ||
| " xplotRequire(['plotly'], function(Plotly) {\r\n", | ||
| "\n", | ||
| " var data = [{\"type\":\"bar\",\"x\":[\"A\",\"B\",\"C\"],\"y\":[1,3,2],\"name\":\"Bar\"}];\n", | ||
| " var layout = {\"title\":\"A bar plot\"};\n", | ||
| " Plotly.newPlot('9a70b50f-ec94-4c20-8fa8-e14290eb0440', data, layout);\n", | ||
| " \r\n", | ||
| "});\r\n", | ||
| "};\r\n", | ||
| "if ((typeof(requirejs) !== typeof(Function)) || (typeof(requirejs.config) !== typeof(Function))) { \r\n", | ||
| " var script = document.createElement(\"script\"); \r\n", | ||
| " script.setAttribute(\"src\", \"https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js\"); \r\n", | ||
| " script.onload = function(){\r\n", | ||
| " renderPlotly();\r\n", | ||
| " };\r\n", | ||
| " document.getElementsByTagName(\"head\")[0].appendChild(script); \r\n", | ||
| "}\r\n", | ||
| "else {\r\n", | ||
| " renderPlotly();\r\n", | ||
| "}\r\n", | ||
| "</script>\r\n" | ||
| ] | ||
| }, | ||
| "metadata": {}, | ||
| "output_type": "display_data" | ||
| } | ||
| ], | ||
| "source": [ | ||
| "using XPlot.Plotly;\n", | ||
| "\n", | ||
| "var bar = new Graph.Bar\n", | ||
| "{\n", | ||
| " name = \"Bar\",\n", | ||
| " x = new[] {'A', 'B', 'C'},\n", | ||
| " y = new[] {1, 3, 2}\n", | ||
| "};\n", | ||
| "\n", | ||
| "var chart = Chart.Plot(new[] {bar});\n", | ||
| "chart.WithTitle(\"A bar plot\");\n", | ||
| "display(chart);" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "markdown", | ||
| "metadata": {}, | ||
| "source": [ | ||
| "We also test the math outputs as in the [Math and Latex](https://github.com/dotnet/interactive/blob/master/NotebookExamples/csharp/Docs/Math%20and%20LaTeX.ipynb) example:" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": 3, | ||
| "metadata": {}, | ||
| "outputs": [ | ||
| { | ||
| "data": { | ||
| "text/latex": [ | ||
| "\\begin{align} e^{i \\pi} = -1\\end{align}" | ||
| ] | ||
| }, | ||
| "execution_count": 3, | ||
| "metadata": {}, | ||
| "output_type": "execute_result" | ||
| } | ||
| ], | ||
| "source": [ | ||
| "(LaTeXString)@\"\\begin{align} e^{i \\pi} = -1\\end{align}\"" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": 4, | ||
| "metadata": {}, | ||
| "outputs": [ | ||
| { | ||
| "data": { | ||
| "text/latex": [ | ||
| "$$e^{i \\pi} = -1$$" | ||
| ] | ||
| }, | ||
| "execution_count": 4, | ||
| "metadata": {}, | ||
| "output_type": "execute_result" | ||
| } | ||
| ], | ||
| "source": [ | ||
| "(MathString)@\"e^{i \\pi} = -1\"" | ||
| ] | ||
| } | ||
| ], | ||
| "metadata": { | ||
| "kernelspec": { | ||
| "display_name": ".NET (C#)", | ||
| "language": "C#", | ||
| "name": ".net-csharp" | ||
| }, | ||
| "language_info": { | ||
| "file_extension": ".cs", | ||
| "mimetype": "text/x-csharp", | ||
| "name": "C#", | ||
| "pygments_lexer": "csharp", | ||
| "version": "8.0" | ||
| } | ||
| }, | ||
| "nbformat": 4, | ||
| "nbformat_minor": 1 | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| { | ||
| "cells": [ | ||
| { | ||
| "cell_type": "markdown", | ||
| "metadata": {}, | ||
| "source": [ | ||
| "This notebook was inspired by [Plottting with XPlot](https://github.com/dotnet/interactive/blob/master/NotebookExamples/fsharp/Docs/Plotting%20with%20Xplot.ipynb)." | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": 1, | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "open XPlot.Plotly" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": 2, | ||
| "metadata": {}, | ||
| "outputs": [ | ||
| { | ||
| "data": { | ||
| "text/html": [ | ||
| "<div id=\"401733f6-77ba-44c5-bb00-14b2beb80964\" style=\"width: 900px; height: 500px;\"></div>\r\n", | ||
| "<script type=\"text/javascript\">\r\n", | ||
| "\r\n", | ||
| "var renderPlotly = function() {\r\n", | ||
| " var xplotRequire = requirejs.config({context:'xplot-3.0.1',paths:{plotly:'https://cdn.plot.ly/plotly-1.49.2.min'}});\r\n", | ||
| " xplotRequire(['plotly'], function(Plotly) {\r\n", | ||
| "\n", | ||
| " var data = [{\"type\":\"bar\",\"x\":[\"A\",\"B\",\"C\"],\"y\":[1,3,2],\"name\":\"Bar 1\"}];\n", | ||
| " var layout = {\"title\":\"A sample bar plot\"};\n", | ||
| " Plotly.newPlot('401733f6-77ba-44c5-bb00-14b2beb80964', data, layout);\n", | ||
| " \r\n", | ||
| "});\r\n", | ||
| "};\r\n", | ||
| "if ((typeof(requirejs) !== typeof(Function)) || (typeof(requirejs.config) !== typeof(Function))) { \r\n", | ||
| " var script = document.createElement(\"script\"); \r\n", | ||
| " script.setAttribute(\"src\", \"https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js\"); \r\n", | ||
| " script.onload = function(){\r\n", | ||
| " renderPlotly();\r\n", | ||
| " };\r\n", | ||
| " document.getElementsByTagName(\"head\")[0].appendChild(script); \r\n", | ||
| "}\r\n", | ||
| "else {\r\n", | ||
| " renderPlotly();\r\n", | ||
| "}\r\n", | ||
| "</script>\r\n" | ||
| ] | ||
| }, | ||
| "execution_count": 2, | ||
| "metadata": {}, | ||
| "output_type": "execute_result" | ||
| } | ||
| ], | ||
| "source": [ | ||
| "let bar =\n", | ||
| " Bar(\n", | ||
| " name = \"Bar 1\",\n", | ||
| " x = [\"A\"; \"B\"; \"C\"],\n", | ||
| " y = [1; 3; 2])\n", | ||
| "\n", | ||
| "[bar]\n", | ||
| "|> Chart.Plot\n", | ||
| "|> Chart.WithTitle \"A sample bar plot\"" | ||
| ] | ||
| } | ||
| ], | ||
| "metadata": { | ||
| "kernelspec": { | ||
| "display_name": ".NET (F#)", | ||
| "language": "F#", | ||
| "name": ".net-fsharp" | ||
| }, | ||
| "language_info": { | ||
| "file_extension": ".fs", | ||
| "mimetype": "text/x-fsharp", | ||
| "name": "C#", | ||
| "pygments_lexer": "fsharp", | ||
| "version": "4.5" | ||
| } | ||
| }, | ||
| "nbformat": 4, | ||
| "nbformat_minor": 2 | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --- | ||
| jupyter: | ||
| kernelspec: | ||
| display_name: .NET (C#) | ||
| language: C# | ||
| name: .net-csharp | ||
| --- | ||
|
|
||
| We start with... | ||
|
|
||
| ```{csharp} | ||
| Console.WriteLine("Hello World!"); | ||
| ``` | ||
|
|
||
| Then we do a plot with Plotly, following the [Plotting with XPlot](https://github.com/dotnet/interactive/blob/master/NotebookExamples/csharp/Docs/Plotting%20with%20Xplot.ipynb) example from `dotnet/interactive`: | ||
|
|
||
| ```{csharp} | ||
| using XPlot.Plotly; | ||
|
|
||
| var bar = new Graph.Bar | ||
| { | ||
| name = "Bar", | ||
| x = new[] {'A', 'B', 'C'}, | ||
| y = new[] {1, 3, 2} | ||
| }; | ||
|
|
||
| var chart = Chart.Plot(new[] {bar}); | ||
| chart.WithTitle("A bar plot"); | ||
| display(chart); | ||
| ``` | ||
|
|
||
| We also test the math outputs as in the [Math and Latex](https://github.com/dotnet/interactive/blob/master/NotebookExamples/csharp/Docs/Math%20and%20LaTeX.ipynb) example: | ||
|
|
||
| ```{csharp} | ||
| (LaTeXString)@"\begin{align} e^{i \pi} = -1\end{align}" | ||
| ``` | ||
|
|
||
| ```{csharp} | ||
| (MathString)@"e^{i \pi} = -1" | ||
| ``` |
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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| --- | ||
| jupyter: | ||
| kernelspec: | ||
| display_name: .NET (F#) | ||
| language: F# | ||
| name: .net-fsharp | ||
| --- | ||
|
|
||
| This notebook was inspired by [Plottting with XPlot](https://github.com/dotnet/interactive/blob/master/NotebookExamples/fsharp/Docs/Plotting%20with%20Xplot.ipynb). | ||
|
|
||
| ```{fsharp} | ||
| open XPlot.Plotly | ||
| ``` | ||
|
|
||
| ```{fsharp} | ||
| let bar = | ||
| Bar( | ||
| name = "Bar 1", | ||
| x = ["A"; "B"; "C"], | ||
| y = [1; 3; 2]) | ||
|
|
||
| [bar] | ||
| |> Chart.Plot | ||
| |> Chart.WithTitle "A sample bar plot" | ||
| ``` |
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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // --- | ||
| // jupyter: | ||
| // kernelspec: | ||
| // display_name: .NET (C#) | ||
| // language: C# | ||
| // name: .net-csharp | ||
| // --- | ||
|
|
||
| // %% [markdown] | ||
| // We start with... | ||
|
|
||
| // %% | ||
| Console.WriteLine("Hello World!"); | ||
|
|
||
| // %% [markdown] | ||
| // Then we do a plot with Plotly, following the [Plotting with XPlot](https://github.com/dotnet/interactive/blob/master/NotebookExamples/csharp/Docs/Plotting%20with%20Xplot.ipynb) example from `dotnet/interactive`: | ||
|
|
||
| // %% | ||
| using XPlot.Plotly; | ||
|
|
||
| var bar = new Graph.Bar | ||
| { | ||
| name = "Bar", | ||
| x = new[] {'A', 'B', 'C'}, | ||
| y = new[] {1, 3, 2} | ||
| }; | ||
|
|
||
| var chart = Chart.Plot(new[] {bar}); | ||
| chart.WithTitle("A bar plot"); | ||
| display(chart); | ||
|
|
||
| // %% [markdown] | ||
| // We also test the math outputs as in the [Math and Latex](https://github.com/dotnet/interactive/blob/master/NotebookExamples/csharp/Docs/Math%20and%20LaTeX.ipynb) example: | ||
|
|
||
| // %% | ||
| (LaTeXString)@"\begin{align} e^{i \pi} = -1\end{align}" | ||
|
|
||
| // %% | ||
| (MathString)@"e^{i \pi} = -1" |
Oops, something went wrong.
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.
Two other file extensions for F#:
.fsx- F# scripting file, can be loaded directly into the F# Interactive process.fsi- F# interface file (similar to OCAML interface files), used mostly in very large codebases to encapsulate code constructs.fsiis probably not relevant to this project, but.fsxmight be.