chore: remove ruff-lsp deps

secretflow · Aug 30, 2024 · 880bbb2 · 880bbb2
1 parent c44cdb0
commit 880bbb2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
@@ -34,11 +34,6 @@ FROM secretflow/secretflow-anolis8:1.6.1b0
 
 RUN useradd -m secretnote
 
-RUN curl -fsSL https://rpm.nodesource.com/setup_18.x | bash -
-RUN yum install -y nodejs
-RUN npm config set registry https://registry.npmmirror.com
-RUN npm install @difizen/libro-analyzer
-
 COPY --from=build /dist /dist
 RUN pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/
 RUN pip install /dist/pyprojects/secretnote/dist/*.whl
@@ -47,6 +42,11 @@ WORKDIR /home/secretnote
 
 COPY ./docker/app/root/ ./
 
+RUN curl -fsSL https://rpm.nodesource.com/setup_18.x | bash -
+RUN yum install -y nodejs
+RUN npm config set registry https://registry.npmmirror.com
+RUN npm install @difizen/libro-analyzer
+
 RUN mkdir workspace
 
 RUN chown -R secretnote:secretnote /home/secretnote

diff --git a/docker/app/root/.jupyter/jupyter_server_config.py b/docker/app/root/.jupyter/jupyter_server_config.py
@@ -20,16 +20,7 @@
 c.LanguageServerManager.autodetect = False
 
 c.LanguageServerManager.language_servers = {
-    "ruff-lsp": {
-        # if installed as a binary
-        "argv": [
-            "ruff-lsp",
-        ],
-        "languages": ["python"],
-        "version": 2,
-        "mime_types": ["text/x-python"],
-        "display_name": "ruff-lsp",
-    },
+    # whole notebook LSP ability.
     "libro-analyzer": {
         # if installed as a binary
         "argv": [
@@ -43,3 +34,5 @@
         "display_name": "libro-analyzer",
     },
 }
+
+c.ResourceUseDisplay.track_cpu_percent = True
diff --git a/pyprojects/secretnote/pyproject.toml b/pyprojects/secretnote/pyproject.toml
@@ -28,7 +28,7 @@ dependencies = [
   "stack_data>=0.6.3",
   "tqdm>=4.66.1",
   "dataset>=1.6.2",
-  "ruff-lsp>=0.0.53",
+  # "ruff-lsp>=0.0.53",
   "python-lsp-server==1.8.2",
   # https://github.com/python/typing_extensions/issues/369#issuecomment-2051331676
   "typing_extensions>=4.6",
@@ -88,8 +88,8 @@ sources = ["src"]
 [tool.pytest.ini_options]
 pythonpath = ["src"]
 
-[tool.ruff]
-extend = "../../pyproject.toml"
+# [tool.ruff]
+# extend = "../../pyproject.toml"
 
-[tool.ruff.extend-per-file-ignores]
-"src/secretnote/proto/**/*" = ["E501", "I001"]
+# [tool.ruff.extend-per-file-ignores]
+# "src/secretnote/proto/**/*" = ["E501", "I001"]
diff --git a/requirements.lock b/requirements.lock
@@ -109,8 +109,8 @@ rfc3339-validator==0.1.4
 rfc3986-validator==0.1.1
 rich==13.7.0
 rpds-py==0.17.1
-ruff==0.2.2
-ruff-lsp==0.0.53
+# ruff==0.2.2
+# ruff-lsp==0.0.53
 send2trash==1.8.2
 simpervisor==1.0.0
 six==1.16.0