Skip to content

Commit

Permalink
merge main into release/jupyter (#2705)
Browse files Browse the repository at this point in the history
* rename --from-value to --value

* use formatted value in the value kernel

* api contract change

* test fallback to text/plain

test

* test value info produced

* change default HTML formatting to a tree layout rather than a table (#2671)

* split HTML formatter tests into smaller files

* split PlainTextFormatterTests into smaller files

* refactoring

* implement tree views for objects

* remove HtmlFormatter.MaxProperties

* improve dictionary and sequence rendering, open top level of treeview

* remove old object table formatters, clean up

* Links for mermaid and kql added

As a convenience i added links for kql and mermaid because i assume that these are lesser well known

* improve variable explorer view (#2634)

* implementation for filter and resize


restore


update fonts


remove dummy data

* rename

* disable build (#2687)

* delete my binder

* Value explorer improvements (#2690)

* change header text

* fix input

* use routing slip and intercept completions of sendvalue

* Enforce a minimum version for Kusto and SQL Service dotnet tools. (#2689)

* Enforce a minimum version for Kusto and SQL Service dotnet tools.

* Update name.

* Specify nuget package name.

* Refactor install code and add update

* Add quotes around provided arguments

* Make classes internal

* Remove internal Utils class from API compatibility tests.

* Update formatting.md

* replace Clear() by ResetToDefault()
* replace 404 urls for default formatters

* if .ipynb document metadata isn't present, fall back to interpreting the kernelspec (#2692)

* skip ci on certain changes (#2695)

* rename folders (#2696)

* wip

* wip on changing KernelCommandResult.KernelEvents from IObservable to list

* more API usage cleanup

* remove KernelCommandResult.KernelEvents

* cleanup

* enable ellispsis (#2701)

* enable ellispsis


adding tooltips

* use percentage


test


track affected column on drag start

* merge changes with main and make fixes

* fix (#2706)

---------

Co-authored-by: Diego Colombo <colombod@me.com>
Co-authored-by: Jon Sequeira <jonsequeira@gmail.com>
Co-authored-by: surfmuggle <1271555+surfmuggle@users.noreply.github.com>
Co-authored-by: Diego Colombo <dicolomb@microsoft.com>
Co-authored-by: Cory Rivera <corivera@microsoft.com>
Co-authored-by: Marc Kruzik <51711029+marckruzik@users.noreply.github.com>
Co-authored-by: Brett V. Forsgren <brettfo@microsoft.com>
  • Loading branch information
8 people committed Feb 9, 2023
1 parent 07398d9 commit 0ccfced
Show file tree
Hide file tree
Showing 339 changed files with 15,722 additions and 6,467 deletions.
16 changes: 10 additions & 6 deletions .devcontainer/workspace.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@
"path": ".."
},
{
"path": "../src/dotnet-interactive-npm"
"path": "../src/polyglot-notebooks-browser"
},
{
"name": "VS Code - Stable",
"path": "../src/dotnet-interactive-vscode/stable"
"path": "../src/polyglot-notebooks-ui-components"
},
{
"name": "VS Code - Insiders",
"path": "../src/dotnet-interactive-vscode/insiders"
"path": "../src/polyglot-notebooks"
},
{
"name": "VS Code - Stable",
"path": "../src/polyglot-notebooks-vscode"
},
{
"path": "../src/Microsoft.DotNet.Interactive.Js"
"name": "VS Code - Insiders",
"path": "../src/polyglot-notebooks-vscode-insiders"
}

],
"settings": {}
}
2 changes: 1 addition & 1 deletion DEVELOPER-GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ To get started, you'll need:

2. Follow the regular build instructions as given above.

3. Open the `<REPO-ROOT>/src/dotnet-interactive-vscode-insiders` directory in Visual Studio Code Insiders. (From your terminal, you can run `code-insiders <REPO-ROOT>/src/dotnet-interactive-vscode-insiders`.)
3. Open the `<REPO-ROOT>/src/polyglot-notebooks-vscode-insiders` directory in Visual Studio Code Insiders. (From your terminal, you can run `code-insiders <REPO-ROOT>/src/polyglot-notebooks-vscode-insiders`.)

4. Make the desired source code changes.

Expand Down
89 changes: 0 additions & 89 deletions Dockerfile

This file was deleted.

6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
- PowerShell
- JavaScript
- SQL
- KQL (Kusto Query Language)
- KQL ([Kusto Query Language](https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/))
- HTML*
- Mermaid*
- [Mermaid](https://mermaid.js.org/intro/)*

*Variable sharing not available

Expand All @@ -33,9 +33,7 @@ For the best experience when working with multi-language notebooks, we recommend

There are several ways to get started using .NET Interactive with Jupyter, including Jupyter Notebook, JupyterLab, and nteract.

* [Try sample notebooks online using Binder](docs/NotebooksOnBinder.md).
* [Create and run notebooks on your machine](docs/NotebookswithJupyter.md).
* [Share notebooks online using Binder](docs/CreateBinder.md).


### REPLs
Expand Down
103 changes: 47 additions & 56 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,51 @@
# CI and PR triggers
trigger:
- main
- feature/*
- hotfix/*
- release/*
branches:
include:
- main
- feature/*
- hotfix/*
- release/*
paths:
include:
- '*'
exclude:
- '**/*.md'
- .config/*
- .devcontainer/*
- .github/*
- .vscode/*
- assets/*
- docs/*
- images/*
- .editorconfig
- .gitignore
- '*.txt'
- '*.github-issues'

pr:
- main
- feature/*
- hotfix/*
- release/*
branches:
include:
- main
- feature/*
- hotfix/*
- release/*
paths:
include:
- '*'
exclude:
- '**/*.md'
- .config/*
- .devcontainer/*
- .github/*
- .vscode/*
- assets/*
- docs/*
- images/*
- .editorconfig
- .gitignore
- '*.txt'
- '*.github-issues'

# Variables
variables:
Expand Down Expand Up @@ -182,7 +219,7 @@ stages:
inputs:
filePath: $(Build.SourcesDirectory)/eng/package/PackNpmPackage.ps1
arguments: -packageVersionNumber $(StableToolVersionNumber) -outDir "$(Build.ArtifactStagingDirectory)\npm"
workingDirectory: "$(Build.SourcesDirectory)/src/microsoft-dotnet-interactive"
workingDirectory: "$(Build.SourcesDirectory)/src/polyglot-notebooks"
pwsh: true

- task: PublishBuildArtifacts@1
Expand Down Expand Up @@ -308,52 +345,6 @@ stages:
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults'
condition: always()

- template: /eng/common/templates/jobs/jobs.yml
parameters:
enableMicrobuild: true
enableSbom: false
jobs:
- job: Dockerfile_Main
pool:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
steps:
- checkout: self
clean: true
- task: Docker@2
displayName: Build main Dockerfile
continueOnError: true
inputs:
command: build
Dockerfile: "$(Build.SourcesDirectory)/Dockerfile"

- template: /eng/common/templates/jobs/jobs.yml
parameters:
enableMicrobuild: true
enableSbom: false
jobs:
- job: Dockerfile_Binder_Dependency
pool:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
steps:
- checkout: self
clean: true
- task: Docker@2
displayName: Build Binder dependency Dockerfile
continueOnError: true
inputs:
command: build
Dockerfile: "$(Build.SourcesDirectory)/samples/my binder/Dockerfile"

#---------------------------------------------------------------------------------------------------------------------#
# Post Build #
#---------------------------------------------------------------------------------------------------------------------#
Expand Down Expand Up @@ -389,7 +380,7 @@ stages:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: eng/publish/publish-npm.yml
parameters:
packageName: microsoft-dotnet-interactive-*.tgz
packageName: microsoft-polyglot-notebooks-*.tgz
registryUrl: pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/npm/registry/
registryUser: dnceng
registryEmail: dnceng@microsoft.com
Expand Down
56 changes: 0 additions & 56 deletions docs/CreateBinder.md

This file was deleted.

45 changes: 0 additions & 45 deletions docs/NotebooksOnBinder.md

This file was deleted.

4 changes: 0 additions & 4 deletions docs/NotebookswithJupyter.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,3 @@ To launch Jupyter, you can run either `jupyter lab` or `jupyter notebook` from y
Once Jupyter has launched in your browser, you have the option to create notebooks using C#, F#, or PowerShell.

<img src = "https://user-images.githubusercontent.com/547415/78056370-ddd0cc00-7339-11ea-9379-c40f8b5c1ae5.png" width = "70%">

For more information on the .NET notebook experience, please check out our samples and documentation on [Binder](https://mybinder.org/v2/gh/dotnet/interactive/main?urlpath=lab) or in this repo under [`docs`](../docs/README.md) and [`samples`](../samples/readme.md).

Once you've created a .NET notebook, you might want to share it with others. In the [next document](CreateBinder.md), you will learn how to share your .NET notebook with others using Binder.
Loading

0 comments on commit 0ccfced

Please sign in to comment.