Merge branch 'main' of https://github.com/cronan03/jupyterlab-builder

jupyterlab · Jun 4, 2024 · d47a9bf · d47a9bf
2 parents 8119f81 + ac7c1e0
commit d47a9bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/license-header.yml b/.github/workflows/license-header.yml
@@ -24,7 +24,7 @@ jobs:
 
       - name: Fix License Header
         # pin to include https://github.com/apache/skywalking-eyes/pull/168
-        uses: apache/skywalking-eyes/header@ed436a5593c63a25f394ea29da61b0ac3731a9fe
+        uses: apache/skywalking-eyes/header@cd7b195c51fd3d6ad52afceb760719ddc6b3ee91
         with:
           mode: fix
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -55,7 +55,7 @@ repos:
           ["traitlets>=5.13"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.0
+    rev: v0.3.4
     hooks:
       - id: ruff
         types_or: [python, jupyter]

diff --git a/pyproject.toml b/pyproject.toml
@@ -60,7 +60,7 @@ dev = [
     "pytest-cov",
     "coverage",
     "hatch",
-    "ruff==0.3.0",
+    "ruff==0.4.7",
 ]
 
 [project.scripts]

diff --git a/tests/test_tpl.py b/tests/test_tpl.py
@@ -1,5 +1,9 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> ac7c1e03bb773db0a2a25814358ed4ebb690bf88
 def test_tpl():
     assert True