-
Notifications
You must be signed in to change notification settings - Fork 160
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
Upgrade nbdime for jupyterlab 4 #664
Closed
HaudinFlorence
wants to merge
81
commits into
jupyter:master
from
HaudinFlorence:upgrate_nbdime_for_jupyterlab_4
Closed
Changes from 18 commits
Commits
Show all changes
81 commits
Select commit
Hold shift + click to select a range
93383a7
Update dependencies for jupyterlab 4.
HaudinFlorence d33c94c
EditorWrapper migrated to CM6 and started mergeview
HaudinFlorence a1e3402
Update mergeview.ts and other files.
HaudinFlorence 2c1a796
Update dependencies.
HaudinFlorence 49873e7
Fixed build
JohanMabille 66c64a5
Migrate highlighting to CM6.
HaudinFlorence 9739058
Migrate padding to CM6.
HaudinFlorence 8b0b49d
Keep on migrating padding (one effect by editor using decoration sets…
HaudinFlorence ad8495a
Migrate gutter markers.
HaudinFlorence 405a535
Keep on migrating gutter markers
HaudinFlorence 16a3fe5
Restore the missing syntax highlighting
HaudinFlorence 22d9e3e
Update alignViews in mergeview.ts to correct padding issues (only the…
HaudinFlorence f5b0594
Fix spacers algorithm
fcollonval 8a0cc2c
Fix last spacer
fcollonval eff078a
Merge pull request #1 from fcollonval/fix/alignement
HaudinFlorence 6821c6d
Update alignViews in mergeview.ts to correct padding issues (only the…
HaudinFlorence 76de3b4
Merge branch 'upgrate_nbdime_for_jupyterlab_4' of https://github.com/…
HaudinFlorence 10fb172
Add first ui-tests
HaudinFlorence ee73abd
Update mergeview.ts to take review comments into account.
HaudinFlorence 69ca95e
Update css files with minor changes.
HaudinFlorence f3689ad
Update to take review into account.
HaudinFlorence 7b060a7
Keep on taking review into account regarding the iterator issue, depe…
HaudinFlorence 055332d
Add jest types
jtpio 119e45e
Try fix CI js failing tests and try to fix PatchObjectHelper iterator.
HaudinFlorence 10b5a3a
Fix iterator implementation on `PatchObjectHelper`
krassowski a78edcd
Fix tests
krassowski 6883a59
Fix Python test failing due to retained decorator
krassowski 90218ff
Remove one more remnant of old mathjax
krassowski 8835d16
Disable auto-detection of language servers to reduce startup time
krassowski ee8c3a8
Add ui-tests to github workflows.
HaudinFlorence a50750c
Add missing directory with example notebooks data/default/test2.
HaudinFlorence 38fed9c
Try to make ui-tests work.
HaudinFlorence 21f7229
Update ./github/workflows/tests.yml
HaudinFlorence ba72840
Update .github/workflows/tests.yml
HaudinFlorence 1505ecb
Remove last commit change adding option --update-snapshots for npx pl…
HaudinFlorence b0e7fd3
Update .github/workflows/tests.yml
HaudinFlorence 0001278
Update .github/workflows/update-integration-tests.yml
HaudinFlorence 7647ee3
Take comments into account regarding test.yml file and tests.
HaudinFlorence 73ac322
Apply suggestions from code review
HaudinFlorence 4516871
Remove `set -eux` because it is Unix-only
krassowski 4e7f0de
Use npm client
krassowski fb33501
Actually pass python version to setup script
krassowski a0e2893
Add missing `run`
krassowski 31d933e
Add comment/reaction steps
krassowski c75e560
Add polyfill for playwright npx run
krassowski 50fd2ab
Only update snapshots on latest Python, run one at a time
krassowski ecfc9d4
Update Playwright Snapshots
github-actions[bot] bbcedc3
Apply suggestions from code review
HaudinFlorence 5e08176
Restore green colors backgrounds for the right editor for a diff.
HaudinFlorence 43e6b01
Fix the added cells CSS style.
HaudinFlorence 69d6d0d
Fix alignment shift for diff in alignViews.
HaudinFlorence fa30261
Fix `lineChunks` and editor configuration, including readOnly
krassowski 0b43dbb
Remove hard-coded `lineNumbers` option
krassowski a24caec
Merge pull request #10 from krassowski/fix-1-and-2
HaudinFlorence 0514335
Update mergeview.ts and diff.css to try to fix the added or deleted c…
HaudinFlorence e59d840
Take comment into account to fix the background of added/deleted cells.
HaudinFlorence b456cb9
Restore `getMergedValue()`
krassowski 69c757d
Restore border indicator, remove unused .CodeMirror selector
krassowski 84272ab
Merge pull request #11 from krassowski/final-fixes
HaudinFlorence 22f9f70
Add ui-tests for diff and change ui-tests names and descriptions.
HaudinFlorence b887cef
Fix dep specification
fcollonval abaae02
Restore CSS scoping
fcollonval 6e23fd0
Reduce diff due to format changes
fcollonval 3ec3251
Restore `getMergedValue`
fcollonval ce62ca5
Improve integration tests
fcollonval 89f35b9
Improve integration tests
fcollonval 9768c1e
Avoid duplicating example/test contents
fcollonval 4f6498b
Instantiate registries only once
fcollonval ba33eb5
Only create editor factory (and associated registries) once
fcollonval fd8c91f
Don't remove favicon when cleaning
fcollonval a35c7c0
Remove old typings
fcollonval 8b42c16
Fix style not deduplicated
fcollonval e632709
Use only prebuilt extension
fcollonval 274387b
Fix jobs config
fcollonval 1e5ec7c
Fix jest tests
fcollonval 314936e
Fix integration tests
fcollonval 0149b17
Update symlink
fcollonval 8250a96
Update Playwright Snapshots
github-actions[bot] 19e7329
Update Playwright Snapshots
github-actions[bot] 1a9d565
Update ui-tests/tests/nbdime-merge-test1.spec.ts
fcollonval e345cd7
Merge pull request #12 from fcollonval/small-things
HaudinFlorence 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ MANIFEST | |
.cache | ||
.pytest_cache | ||
.idea | ||
.yarn | ||
|
||
|
||
.spyderproject | ||
|
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,38 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"id": "44a9ad96-674a-49e5-94ee-9d84f386ecbc", | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"\n", | ||
"a = np.arange(15).reshape(3, 5)\n", | ||
"b = np.arange(5)\n", | ||
"c = a + b" | ||
] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Python 3 (ipykernel)", | ||
"language": "python", | ||
"name": "python3" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": { | ||
"name": "ipython", | ||
"version": 3 | ||
}, | ||
"file_extension": ".py", | ||
"mimetype": "text/x-python", | ||
"name": "python", | ||
"nbconvert_exporter": "python", | ||
"pygments_lexer": "ipython3", | ||
"version": "3.11.3" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 5 | ||
} |
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 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"id": "44a9ad96-674a-49e5-94ee-9d84f386ecbc", | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"import numpy\n", | ||
"\n", | ||
"a = np.arange(15).reshape(3, 5)\n", | ||
"b = np.arange(5)\n", | ||
"c = a + b" | ||
] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Python 3 (ipykernel)", | ||
"language": "python", | ||
"name": "python3" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": { | ||
"name": "ipython", | ||
"version": 3 | ||
}, | ||
"file_extension": ".py", | ||
"mimetype": "text/x-python", | ||
"name": "python", | ||
"nbconvert_exporter": "python", | ||
"pygments_lexer": "ipython3", | ||
"version": "3.11.3" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 5 | ||
} |
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,41 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"id": "44a9ad96-674a-49e5-94ee-9d84f386ecbc", | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"import numpy\n", | ||
"\n", | ||
"a = np.arange(15).reshape(3, 5)\n", | ||
"b = np.array([1, 3, 5, 4, 2])\n", | ||
"c = a + b\n", | ||
"\n", | ||
"d = a - b" | ||
] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Python 3 (ipykernel)", | ||
"language": "python", | ||
"name": "python3" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": { | ||
"name": "ipython", | ||
"version": 3 | ||
}, | ||
"file_extension": ".py", | ||
"mimetype": "text/x-python", | ||
"name": "python", | ||
"nbconvert_exporter": "python", | ||
"pygments_lexer": "ipython3", | ||
"version": "3.11.3" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 5 | ||
} |
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,56 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"id": "eabfe4e0-d646-4d09-95a4-09ee3d030db6", | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"import numpy as np\n", | ||
"import matplotlib.pyplot as plt\n", | ||
"\n", | ||
"def gaussian(x, a, b, c):\n", | ||
" #calculate a gaussian\n", | ||
" return a * np.exp(-b * (x-c)**2)\n", | ||
"\n", | ||
"def sinus ():\n", | ||
" # Here you can see a sinus function\n", | ||
" nx = 100\n", | ||
" x = np.linspace(-5.0, 5.0, nx)\n", | ||
" y = np.sin(x)\n", | ||
" return x, y\n", | ||
"\n", | ||
"def noisy_gaussian():\n", | ||
" # gaussian array y in interval -5 <= x <= 5\n", | ||
" nx = 100\n", | ||
" x = np.linspace(-5.0, 5.0, nx)\n", | ||
" y = gaussian(x, a=2.0, b=0.5, c=1.5)\n", | ||
" noise = np.random.normal(0.0, 0.2, nx)\n", | ||
" y += noise\n", | ||
" return x, y" | ||
] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Python 3 (ipykernel)", | ||
"language": "python", | ||
"name": "python3" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": { | ||
"name": "ipython", | ||
"version": 3 | ||
}, | ||
"file_extension": ".py", | ||
"mimetype": "text/x-python", | ||
"name": "python", | ||
"nbconvert_exporter": "python", | ||
"pygments_lexer": "ipython3", | ||
"version": "3.11.3" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 5 | ||
} |
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,53 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"id": "2d47bfe2-d91d-4f72-9426-1885c4edb5a9", | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"import numpy as np\n", | ||
"import matplotlib.pyplot as plt\n", | ||
"%matplotlib inline\n", | ||
"%this is a comment\n", | ||
"% more more comments\n", | ||
"\n", | ||
"def gaussian(x, a, b, c):\n", | ||
" return a * np.exp(-b * (x-c)**2)\n", | ||
" % here a comment\n", | ||
" % second line of comment\n", | ||
"\n", | ||
"def noisy_gaussian():\n", | ||
" # gaussian array y in interval -5 <= x <= 5\n", | ||
" nx = 100\n", | ||
" x = np.linspace(-5.0, 5.0, nx)\n", | ||
" y = gaussian(x, a=2.0, b=0.5, c=1.5)\n", | ||
" noise = np.random.normal(0.0, 0.2, nx)\n", | ||
" y += noise\n", | ||
" return x, y" | ||
] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Python 3 (ipykernel)", | ||
"language": "python", | ||
"name": "python3" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": { | ||
"name": "ipython", | ||
"version": 3 | ||
}, | ||
"file_extension": ".py", | ||
"mimetype": "text/x-python", | ||
"name": "python", | ||
"nbconvert_exporter": "python", | ||
"pygments_lexer": "ipython3", | ||
"version": "3.11.3" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 5 | ||
} |
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,50 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"id": "ff160690-22c8-48f3-9b89-d78a8997baec", | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"import numpy as np\n", | ||
"import matplotlib.pyplot as plt\n", | ||
"\n", | ||
"def gaussian(x, a, b, c):\n", | ||
" return a * np.exp(-b * (x-c)**2)\n", | ||
"\n", | ||
"def noisy_gaussian():\n", | ||
" # gaussian array y in interval -5 <= x <= 5\n", | ||
" nx = 100\n", | ||
" x = np.linspace(-5.0, 5.0, nx)\n", | ||
" y = gaussian(x, a=2.0, b=0.5, c=1.5)\n", | ||
" noise = np.random.normal(0.0, 0.2, nx)\n", | ||
" y += noise\n", | ||
" # add a line\n", | ||
" # add a second line\n", | ||
" return x, y" | ||
] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Python 3 (ipykernel)", | ||
"language": "python", | ||
"name": "python3" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": { | ||
"name": "ipython", | ||
"version": 3 | ||
}, | ||
"file_extension": ".py", | ||
"mimetype": "text/x-python", | ||
"name": "python", | ||
"nbconvert_exporter": "python", | ||
"pygments_lexer": "ipython3", | ||
"version": "3.11.3" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 5 | ||
} |
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 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"id": "eabfe4e0-d646-4d09-95a4-09ee3d030db6", | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"from matplotlib import pyplot as plt\n", | ||
"import numpy as np\n", | ||
"x = np.arange(0, 2, 0.1)\n", | ||
"y1 = np.exp(x)\n", | ||
"plt.plot(x, y1, 'b')" | ||
] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Python 3 (ipykernel)", | ||
"language": "python", | ||
"name": "python3" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": { | ||
"name": "ipython", | ||
"version": 3 | ||
}, | ||
"file_extension": ".py", | ||
"mimetype": "text/x-python", | ||
"name": "python", | ||
"nbconvert_exporter": "python", | ||
"pygments_lexer": "ipython3", | ||
"version": "3.11.3" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 5 | ||
} |
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 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"id": "2d47bfe2-d91d-4f72-9426-1885c4edb5a9", | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"from matplotlib import pyplot as plt\n", | ||
"import numpy as np\n", | ||
"x = np.linspace(0, 2, 10)\n", | ||
"z = np.exp(x + 2)\n", | ||
"plt.plot(x, z, 'c')\n", | ||
"# this is an example" | ||
] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Python 3 (ipykernel)", | ||
"language": "python", | ||
"name": "python3" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": { | ||
"name": "ipython", | ||
"version": 3 | ||
}, | ||
"file_extension": ".py", | ||
"mimetype": "text/x-python", | ||
"name": "python", | ||
"nbconvert_exporter": "python", | ||
"pygments_lexer": "ipython3", | ||
"version": "3.11.3" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 5 | ||
} |
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.
Note that this repo is currently using npm + package-lock.json, so please avoid adding yarn things.
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.
@vidartf Thanks for your feedback. I will change this for npm usage.