Skip to content

Commit d4b0f63

Browse files
authored
Update yarn lock for proper checksum (#1326)
* Update yarn lock for proper checksum * Update broken link * run black * run black
1 parent b878c0b commit d4b0f63

File tree

8 files changed

+29
-17
lines changed

8 files changed

+29
-17
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 23.1.0 # Replace by any tag/version: https://github.com/psf/black/tags
3+
rev: 24.4.2 # Replace by any tag/version: https://github.com/psf/black/tags
44
hooks:
55
- id: black
66
language_version: python3 # Should be a command that runs python3.6+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ The Jupyter Git extension is part of [Project Jupyter](http://jupyter.org/) and
324324
</tr>
325325
<tr>
326326
<td align="center" valign="top" width="14.28%"><a href="http://taletskiy.com"><img src="https://avatars0.githubusercontent.com/u/8834829?v=4?s=100" width="100px;" alt="Konstantin Taletskiy"/><br /><sub><b>Konstantin Taletskiy</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=ktaletsk" title="Code">💻</a> <a href="https://github.com/jupyterlab/jupyterlab-git/pulls?q=is%3Apr+reviewed-by%3Aktaletsk" title="Reviewed Pull Requests">👀</a></td>
327-
<td align="center" valign="top" width="14.28%"><a href="https://kostyafarber.github.io/"><img src="https://avatars.githubusercontent.com/u/73378227?v=4?s=100" width="100px;" alt="Kostya Farber"/><br /><sub><b>Kostya Farber</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=kostyafarber" title="Code">💻</a></td>
327+
<td align="center" valign="top" width="14.28%"><a href="https://kostyafarber.com"><img src="https://avatars.githubusercontent.com/u/73378227?v=4?s=100" width="100px;" alt="Kostya Farber"/><br /><sub><b>Kostya Farber</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=kostyafarber" title="Code">💻</a></td>
328328
<td align="center" valign="top" width="14.28%"><a href="https://www.lindaful.com"><img src="https://avatars.githubusercontent.com/u/68607795?v=4?s=100" width="100px;" alt="Linda Ngoc Nguyen"/><br /><sub><b>Linda Ngoc Nguyen</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=iflinda" title="Code">💻</a></td>
329329
<td align="center" valign="top" width="14.28%"><a href="https://fellowship.mlh.io/"><img src="https://avatars.githubusercontent.com/u/65834464?s=200&v=4?s=100" width="100px;" alt="Major League Hacking"/><br /><sub><b>Major League Hacking</b></sub></a><br /><a href="#financial-mlh" title="">🤝</a></td>
330330
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/max-klein-b514419"><img src="https://avatars2.githubusercontent.com/u/2263641?v=4?s=100" width="100px;" alt="Max Klein"/><br /><sub><b>Max Klein</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=telamonian" title="Code">💻</a> <a href="https://github.com/jupyterlab/jupyterlab-git/pulls?q=is%3Apr+reviewed-by%3Atelamonian" title="Reviewed Pull Requests">👀</a> <a href="#projectManagement-telamonian" title="Project Management">📆</a> <a href="#design-telamonian" title="Design">🎨</a> <a href="#infra-telamonian" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>

examples/demo.ipynb

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@
119119
}
120120
],
121121
"source": [
122-
"import sys; print('this is stderr', file=sys.stderr)"
122+
"import sys\n",
123+
"\n",
124+
"print(\"this is stderr\", file=sys.stderr)"
123125
]
124126
},
125127
{
@@ -253,12 +255,14 @@
253255
}
254256
],
255257
"source": [
256-
"md = Markdown(\"\"\"\n",
258+
"md = Markdown(\n",
259+
" \"\"\"\n",
257260
"### Subtitle\n",
258261
"\n",
259262
"This is some *markdown* text with math $F=ma$.\n",
260263
"\n",
261-
"\"\"\")\n",
264+
"\"\"\"\n",
265+
")\n",
262266
"md"
263267
]
264268
},
@@ -362,13 +366,15 @@
362366
}
363367
],
364368
"source": [
365-
"maxwells = Latex(r\"\"\"\n",
369+
"maxwells = Latex(\n",
370+
" r\"\"\"\n",
366371
"\\begin{align}\n",
367372
"\\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} & = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\ \\nabla \\cdot \\vec{\\mathbf{E}} & = 4 \\pi \\rho \\\\\n",
368373
"\\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} & = \\vec{\\mathbf{0}} \\\\\n",
369374
"\\nabla \\cdot \\vec{\\mathbf{B}} & = 0\n",
370375
"\\end{align}\n",
371-
"\"\"\")\n",
376+
"\"\"\"\n",
377+
")\n",
372378
"maxwells"
373379
]
374380
},
@@ -434,7 +440,7 @@
434440
"img2 = Image(\n",
435441
" \"https://apod.nasa.gov/apod/image/1707/GreatWallMilkyWay_Yu_1686.jpg\",\n",
436442
" width=100,\n",
437-
" height=200\n",
443+
" height=200,\n",
438444
")\n",
439445
"img2"
440446
]

jupyterlab_git/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Initialize the backend server extension
22
"""
3+
34
from traitlets import CFloat, List, Dict, Unicode, default
45
from traitlets.config import Configurable
56

@@ -32,7 +33,7 @@ class JupyterLabGit(Configurable):
3233
config=True,
3334
value_trait=List(
3435
trait=Unicode(), help='List of commands to run. E.g. ["touch baz.py"]'
35-
)
36+
),
3637
# TODO Validate
3738
)
3839

jupyterlab_git/git.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
Module for executing git commands, sending results back to the handlers
33
"""
4+
45
import base64
56
import datetime
67
import os
@@ -646,9 +647,11 @@ async def log(self, path, history_count=10, follow_path=None):
646647
"author": line_array[i + 1],
647648
"date": line_array[i + 2],
648649
"commit_msg": line_array[i + 3],
649-
"pre_commits": line_array[i + 4].split(" ")
650-
if i + 4 < len(line_array) and line_array[i + 4]
651-
else [],
650+
"pre_commits": (
651+
line_array[i + 4].split(" ")
652+
if i + 4 < len(line_array) and line_array[i + 4]
653+
else []
654+
),
652655
}
653656

654657
if is_single_file:
@@ -1238,9 +1241,9 @@ async def pull(self, path, auth=None, cancel_on_conflict=False):
12381241
cwd=path,
12391242
)
12401243
if code == 0:
1241-
response[
1242-
"message"
1243-
] = "Unable to pull latest changes as doing so would result in a merge conflict. In order to push your local changes, you may want to consider creating a new branch based on your current work and pushing the new branch. Provided your repository is hosted (e.g., on GitHub), once pushed, you can create a pull request against the original branch on the remote repository and manually resolve the conflicts during pull request review."
1244+
response["message"] = (
1245+
"Unable to pull latest changes as doing so would result in a merge conflict. In order to push your local changes, you may want to consider creating a new branch based on your current work and pushing the new branch. Provided your repository is hosted (e.g., on GitHub), once pushed, you can create a pull request against the original branch on the remote repository and manually resolve the conflicts during pull request review."
1246+
)
12441247
else:
12451248
response["message"] = error.strip()
12461249
elif has_conflict:

jupyterlab_git/handlers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
Module with all the individual handlers, which execute git commands and return the results to the frontend.
33
"""
4+
45
import functools
56
import json
67
import os

ui-tests/jupyter_server_test_config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
opens the server to the world and provide access to JupyterLab
55
JavaScript objects through the global window variable.
66
"""
7+
78
import sys
89

910
try:

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11562,11 +11562,11 @@ __metadata:
1156211562

1156311563
"typescript@patch:typescript@~5.0.2#~builtin<compat/typescript>":
1156411564
version: 5.0.4
11565-
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=b5f058"
11565+
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=85af82"
1156611566
bin:
1156711567
tsc: bin/tsc
1156811568
tsserver: bin/tsserver
11569-
checksum: d26b6ba97b6d163c55dbdffd9bbb4c211667ebebc743accfeb2c8c0154aace7afd097b51165a72a5bad2cf65a4612259344ff60f8e642362aa1695c760d303ac
11569+
checksum: bb309d320c59a26565fb3793dba550576ab861018ff3fd1b7fccabbe46ae4a35546bc45f342c0a0b6f265c801ccdf64ffd68f548f117ceb7f0eac4b805cd52a9
1157011570
languageName: node
1157111571
linkType: hard
1157211572

0 commit comments

Comments
 (0)