Merge branch 'jupyterlab:master' into fix-issue-1088

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.3.0 # Replace by any tag/version: https://github.com/psf/black/tags
+    rev: 23.1.0 # 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+

jupyterlab_git/git.py

@@ -10,7 +10,6 @@
 import subprocess
 import traceback
 from typing import Dict, List, Optional
-from unittest.mock import NonCallableMock
 from urllib.parse import unquote
 
 import nbformat
@@ -1739,7 +1738,6 @@ def ensure_git_credential_cache_daemon(
             return
 
         if self._GIT_CREDENTIAL_CACHE_DAEMON_PROCESS is None or force:
-
             if force and self._GIT_CREDENTIAL_CACHE_DAEMON_PROCESS:
                 self._GIT_CREDENTIAL_CACHE_DAEMON_PROCESS.terminate()
 

jupyterlab_git/tests/test_branch.py

@@ -27,14 +27,13 @@ def test_is_remote_branch(branch, expected):
 
 @pytest.mark.asyncio
 async def test_get_current_branch_success():
-
     with patch("jupyterlab_git.git.execute") as mock_execute:
         # Given
         mock_execute.return_value = maybe_future((0, "feature-foo", ""))
 
         # When
-        actual_response = await (
-            Git().get_current_branch(path=str(Path("/bin/test_curr_path")))
+        actual_response = await Git().get_current_branch(
+            path=str(Path("/bin/test_curr_path"))
         )
 
         # Then
@@ -269,7 +268,6 @@ async def test_checkout_branch_remoteref_failure():
 
 @pytest.mark.asyncio
 async def test_get_branch_reference_success():
-
     with patch("jupyterlab_git.git.execute") as mock_execute:
         # Given
         actual_response = 0

jupyterlab_git/tests/test_diff.py

@@ -22,7 +22,6 @@ async def test_changed_files_invalid_input():
 
 @pytest.mark.asyncio
 async def test_changed_files_single_commit():
-
     with patch("jupyterlab_git.git.execute") as mock_execute:
         # Given
         mock_execute.return_value = maybe_future((0, "file1.ipynb\x00file2.py\x00", ""))

jupyterlab_git/tests/test_pushpull.py

@@ -95,7 +95,6 @@ async def test_git_pull_with_auth_fail():
 
 @pytest.mark.asyncio
 async def test_git_pull_success():
-
     with patch("os.environ", {"TEST": "test"}):
         with patch("jupyterlab_git.git.execute") as mock_execute:
             # Given
@@ -116,7 +115,6 @@ async def test_git_pull_success():
 
 @pytest.mark.asyncio
 async def test_git_pull_with_auth_success():
-
     with patch("os.environ", {"TEST": "test"}):
         with patch("jupyterlab_git.git.execute") as mock_execute_with_authentication:
             # Given
@@ -287,7 +285,6 @@ async def test_git_push_fail():
 
 @pytest.mark.asyncio
 async def test_git_push_with_auth_fail():
-
     with patch("os.environ", {"TEST": "test"}):
         with patch("jupyterlab_git.git.execute") as mock_execute_with_authentication:
             # Given
@@ -321,7 +318,6 @@ async def test_git_push_with_auth_fail():
 
 @pytest.mark.asyncio
 async def test_git_push_success():
-
     with patch("os.environ", {"TEST": "test"}):
         with patch("jupyterlab_git.git.execute") as mock_execute:
             # Given
@@ -344,7 +340,6 @@ async def test_git_push_success():
 
 @pytest.mark.asyncio
 async def test_git_push_with_auth_success():
-
     with patch("os.environ", {"TEST": "test"}):
         with patch("jupyterlab_git.git.execute") as mock_execute_with_authentication:
             # Given

src/style/FileItemStyle.ts

@@ -107,5 +107,6 @@ export const checkboxLabelContainerStyle = style({
 
 export const checkboxLabelLastContainerStyle = style({
   display: 'flex',
-  marginLeft: 'auto'
+  marginLeft: 'auto',
+  overflow: 'hidden'
 });