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

Update yarn lock for proper checksum #1326

Merged
merged 4 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 23.1.0 # Replace by any tag/version: https://github.com/psf/black/tags
rev: 24.4.2 # Replace by any tag/version: https://github.com/psf/black/tags
hooks:
- id: black
language_version: python3 # Should be a command that runs python3.6+
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ The Jupyter Git extension is part of [Project Jupyter](http://jupyter.org/) and
</tr>
<tr>
<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>
<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>
<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>
<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>
<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>
<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>
Expand Down
18 changes: 12 additions & 6 deletions examples/demo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@
}
],
"source": [
"import sys; print('this is stderr', file=sys.stderr)"
"import sys\n",
"\n",
"print(\"this is stderr\", file=sys.stderr)"
]
},
{
Expand Down Expand Up @@ -253,12 +255,14 @@
}
],
"source": [
"md = Markdown(\"\"\"\n",
"md = Markdown(\n",
" \"\"\"\n",
"### Subtitle\n",
"\n",
"This is some *markdown* text with math $F=ma$.\n",
"\n",
"\"\"\")\n",
"\"\"\"\n",
")\n",
"md"
]
},
Expand Down Expand Up @@ -362,13 +366,15 @@
}
],
"source": [
"maxwells = Latex(r\"\"\"\n",
"maxwells = Latex(\n",
" r\"\"\"\n",
"\\begin{align}\n",
"\\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",
"\\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} & = \\vec{\\mathbf{0}} \\\\\n",
"\\nabla \\cdot \\vec{\\mathbf{B}} & = 0\n",
"\\end{align}\n",
"\"\"\")\n",
"\"\"\"\n",
")\n",
"maxwells"
]
},
Expand Down Expand Up @@ -434,7 +440,7 @@
"img2 = Image(\n",
" \"https://apod.nasa.gov/apod/image/1707/GreatWallMilkyWay_Yu_1686.jpg\",\n",
" width=100,\n",
" height=200\n",
" height=200,\n",
")\n",
"img2"
]
Expand Down
3 changes: 2 additions & 1 deletion jupyterlab_git/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Initialize the backend server extension
"""

from traitlets import CFloat, List, Dict, Unicode, default
from traitlets.config import Configurable

Expand Down Expand Up @@ -32,7 +33,7 @@ class JupyterLabGit(Configurable):
config=True,
value_trait=List(
trait=Unicode(), help='List of commands to run. E.g. ["touch baz.py"]'
)
),
# TODO Validate
)

Expand Down
15 changes: 9 additions & 6 deletions jupyterlab_git/git.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Module for executing git commands, sending results back to the handlers
"""

import base64
import datetime
import os
Expand Down Expand Up @@ -646,9 +647,11 @@ async def log(self, path, history_count=10, follow_path=None):
"author": line_array[i + 1],
"date": line_array[i + 2],
"commit_msg": line_array[i + 3],
"pre_commits": line_array[i + 4].split(" ")
if i + 4 < len(line_array) and line_array[i + 4]
else [],
"pre_commits": (
line_array[i + 4].split(" ")
if i + 4 < len(line_array) and line_array[i + 4]
else []
),
}

if is_single_file:
Expand Down Expand Up @@ -1238,9 +1241,9 @@ async def pull(self, path, auth=None, cancel_on_conflict=False):
cwd=path,
)
if code == 0:
response[
"message"
] = "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."
response["message"] = (
"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."
)
else:
response["message"] = error.strip()
elif has_conflict:
Expand Down
1 change: 1 addition & 0 deletions jupyterlab_git/handlers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Module with all the individual handlers, which execute git commands and return the results to the frontend.
"""

import functools
import json
import os
Expand Down
1 change: 1 addition & 0 deletions ui-tests/jupyter_server_test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
opens the server to the world and provide access to JupyterLab
JavaScript objects through the global window variable.
"""

import sys

try:
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11562,11 +11562,11 @@ __metadata:

"typescript@patch:typescript@~5.0.2#~builtin<compat/typescript>":
version: 5.0.4
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=b5f058"
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=85af82"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: d26b6ba97b6d163c55dbdffd9bbb4c211667ebebc743accfeb2c8c0154aace7afd097b51165a72a5bad2cf65a4612259344ff60f8e642362aa1695c760d303ac
checksum: bb309d320c59a26565fb3793dba550576ab861018ff3fd1b7fccabbe46ae4a35546bc45f342c0a0b6f265c801ccdf64ffd68f548f117ceb7f0eac4b805cd52a9
languageName: node
linkType: hard

Expand Down
Loading