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

Upgrade nbdime for jupyterlab 4 #664

Closed
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
93383a7
Update dependencies for jupyterlab 4.
HaudinFlorence Apr 22, 2023
d33c94c
EditorWrapper migrated to CM6 and started mergeview
HaudinFlorence Apr 25, 2023
a1e3402
Update mergeview.ts and other files.
HaudinFlorence Jun 8, 2023
2c1a796
Update dependencies.
HaudinFlorence Jun 9, 2023
49873e7
Fixed build
JohanMabille Jun 9, 2023
66c64a5
Migrate highlighting to CM6.
HaudinFlorence Jun 14, 2023
9739058
Migrate padding to CM6.
HaudinFlorence Jul 3, 2023
8b0b49d
Keep on migrating padding (one effect by editor using decoration sets…
HaudinFlorence Jul 11, 2023
ad8495a
Migrate gutter markers.
HaudinFlorence Jul 13, 2023
405a535
Keep on migrating gutter markers
HaudinFlorence Jul 21, 2023
16a3fe5
Restore the missing syntax highlighting
HaudinFlorence Jul 31, 2023
22d9e3e
Update alignViews in mergeview.ts to correct padding issues (only the…
HaudinFlorence Aug 17, 2023
f5b0594
Fix spacers algorithm
fcollonval Aug 20, 2023
8a0cc2c
Fix last spacer
fcollonval Aug 21, 2023
eff078a
Merge pull request #1 from fcollonval/fix/alignement
HaudinFlorence Aug 22, 2023
6821c6d
Update alignViews in mergeview.ts to correct padding issues (only the…
HaudinFlorence Aug 17, 2023
76de3b4
Merge branch 'upgrate_nbdime_for_jupyterlab_4' of https://github.com/…
HaudinFlorence Aug 22, 2023
10fb172
Add first ui-tests
HaudinFlorence Aug 24, 2023
ee73abd
Update mergeview.ts to take review comments into account.
HaudinFlorence Aug 25, 2023
69ca95e
Update css files with minor changes.
HaudinFlorence Aug 25, 2023
f3689ad
Update to take review into account.
HaudinFlorence Aug 28, 2023
7b060a7
Keep on taking review into account regarding the iterator issue, depe…
HaudinFlorence Aug 30, 2023
055332d
Add jest types
jtpio Aug 30, 2023
119e45e
Try fix CI js failing tests and try to fix PatchObjectHelper iterator.
HaudinFlorence Aug 30, 2023
10b5a3a
Fix iterator implementation on `PatchObjectHelper`
krassowski Sep 1, 2023
a78edcd
Fix tests
krassowski Sep 1, 2023
6883a59
Fix Python test failing due to retained decorator
krassowski Sep 1, 2023
90218ff
Remove one more remnant of old mathjax
krassowski Sep 1, 2023
8835d16
Disable auto-detection of language servers to reduce startup time
krassowski Sep 1, 2023
ee8c3a8
Add ui-tests to github workflows.
HaudinFlorence Sep 1, 2023
a50750c
Add missing directory with example notebooks data/default/test2.
HaudinFlorence Sep 2, 2023
38fed9c
Try to make ui-tests work.
HaudinFlorence Sep 2, 2023
21f7229
Update ./github/workflows/tests.yml
HaudinFlorence Sep 2, 2023
ba72840
Update .github/workflows/tests.yml
HaudinFlorence Sep 2, 2023
1505ecb
Remove last commit change adding option --update-snapshots for npx pl…
HaudinFlorence Sep 2, 2023
b0e7fd3
Update .github/workflows/tests.yml
HaudinFlorence Sep 2, 2023
0001278
Update .github/workflows/update-integration-tests.yml
HaudinFlorence Sep 2, 2023
7647ee3
Take comments into account regarding test.yml file and tests.
HaudinFlorence Sep 2, 2023
73ac322
Apply suggestions from code review
HaudinFlorence Sep 3, 2023
4516871
Remove `set -eux` because it is Unix-only
krassowski Sep 3, 2023
4e7f0de
Use npm client
krassowski Sep 3, 2023
fb33501
Actually pass python version to setup script
krassowski Sep 3, 2023
a0e2893
Add missing `run`
krassowski Sep 3, 2023
31d933e
Add comment/reaction steps
krassowski Sep 3, 2023
c75e560
Add polyfill for playwright npx run
krassowski Sep 3, 2023
50fd2ab
Only update snapshots on latest Python, run one at a time
krassowski Sep 3, 2023
ecfc9d4
Update Playwright Snapshots
github-actions[bot] Sep 3, 2023
bbcedc3
Apply suggestions from code review
HaudinFlorence Sep 3, 2023
5e08176
Restore green colors backgrounds for the right editor for a diff.
HaudinFlorence Sep 4, 2023
43e6b01
Fix the added cells CSS style.
HaudinFlorence Sep 4, 2023
69d6d0d
Fix alignment shift for diff in alignViews.
HaudinFlorence Sep 5, 2023
fa30261
Fix `lineChunks` and editor configuration, including readOnly
krassowski Sep 6, 2023
0b43dbb
Remove hard-coded `lineNumbers` option
krassowski Sep 7, 2023
a24caec
Merge pull request #10 from krassowski/fix-1-and-2
HaudinFlorence Sep 7, 2023
0514335
Update mergeview.ts and diff.css to try to fix the added or deleted c…
HaudinFlorence Sep 7, 2023
e59d840
Take comment into account to fix the background of added/deleted cells.
HaudinFlorence Sep 7, 2023
b456cb9
Restore `getMergedValue()`
krassowski Sep 7, 2023
69c757d
Restore border indicator, remove unused .CodeMirror selector
krassowski Sep 7, 2023
84272ab
Merge pull request #11 from krassowski/final-fixes
HaudinFlorence Sep 7, 2023
22f9f70
Add ui-tests for diff and change ui-tests names and descriptions.
HaudinFlorence Sep 7, 2023
b887cef
Fix dep specification
fcollonval Sep 7, 2023
abaae02
Restore CSS scoping
fcollonval Sep 7, 2023
6e23fd0
Reduce diff due to format changes
fcollonval Sep 7, 2023
3ec3251
Restore `getMergedValue`
fcollonval Sep 7, 2023
ce62ca5
Improve integration tests
fcollonval Sep 7, 2023
89f35b9
Improve integration tests
fcollonval Sep 7, 2023
9768c1e
Avoid duplicating example/test contents
fcollonval Sep 7, 2023
4f6498b
Instantiate registries only once
fcollonval Sep 7, 2023
ba33eb5
Only create editor factory (and associated registries) once
fcollonval Sep 7, 2023
fd8c91f
Don't remove favicon when cleaning
fcollonval Sep 7, 2023
a35c7c0
Remove old typings
fcollonval Sep 7, 2023
8b42c16
Fix style not deduplicated
fcollonval Sep 7, 2023
e632709
Use only prebuilt extension
fcollonval Sep 7, 2023
274387b
Fix jobs config
fcollonval Sep 7, 2023
1e5ec7c
Fix jest tests
fcollonval Sep 7, 2023
314936e
Fix integration tests
fcollonval Sep 7, 2023
0149b17
Update symlink
fcollonval Sep 8, 2023
8250a96
Update Playwright Snapshots
github-actions[bot] Sep 8, 2023
19e7329
Update Playwright Snapshots
github-actions[bot] Sep 8, 2023
1a9d565
Update ui-tests/tests/nbdime-merge-test1.spec.ts
fcollonval Sep 8, 2023
e345cd7
Merge pull request #12 from fcollonval/small-things
HaudinFlorence Sep 8, 2023
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
10 changes: 4 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v1
with:
Expand Down Expand Up @@ -79,22 +79,20 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ubuntu-latest]
include:
- python-version: '3.11'
jupyter_server-version: '<2'
- python-version: '3.11'
jupyter_server-version: '>=2'
- python-version: '3.7'
os: windows-latest
HaudinFlorence marked this conversation as resolved.
Show resolved Hide resolved
- python-version: '3.11'
os: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v1
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ MANIFEST
.cache
.pytest_cache
.idea
.yarn
Copy link
Collaborator

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.

Copy link
Contributor Author

@HaudinFlorence HaudinFlorence May 2, 2023

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.



.spyderproject
Expand All @@ -28,3 +29,4 @@ nbdime/webapp/static/**
*.tsbuildinfo
packages/webapp/webpack-stats.json
nbdime/labextension/
ui-tests/playwright-report/
38 changes: 38 additions & 0 deletions examples/example1/center.ipynb
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
}
39 changes: 39 additions & 0 deletions examples/example1/left.ipynb
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
}
41 changes: 41 additions & 0 deletions examples/example1/right.ipynb
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
}
56 changes: 56 additions & 0 deletions examples/example10/center.ipynb
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
}
53 changes: 53 additions & 0 deletions examples/example10/left.ipynb
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
}
50 changes: 50 additions & 0 deletions examples/example10/right.ipynb
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
}
39 changes: 39 additions & 0 deletions examples/example2/center.ipynb
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
}
Loading