Switch to uv

.devcontainer/Dockerfile

@@ -1,4 +1,19 @@
-FROM mcr.microsoft.com/vscode/devcontainers/typescript-node
-RUN apt-get update && apt-get install -y python3 python3-pip python3.11-venv
-RUN ln -s /usr/bin/python3 /usr/bin/python
-RUN npm install -g @vscode/vsce
+FROM ghcr.io/astral-sh/uv:debian
+RUN apt-get -q update && \
+    apt-get install -y --no-install-recommends \
+    sudo \
+    vim \
+    npm && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN npm install -g @vscode/vsce
+
+# Setup non-root user
+ARG USERNAME=user
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    #
+    # [Optional] Add sudo support. Omit if you don't need to install software after connecting.
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME

.devcontainer/devcontainer.json

@@ -15,4 +15,5 @@
     "mounts": [
       "source=devcontainer-persistence,target=/devcontainer-persistence,type=volume"
     ],
+    "remoteUser": "user",
   }

.devcontainer/post-create.sh

@@ -8,12 +8,13 @@ if [ ! -e ~/.bash_history ]; then
   ln -s /devcontainer-persistence/.bash_history ~/.bash_history
 fi
 
-python3 -m venv .venv
 for file in ~/.bashrc ~/.bash_profile; do
   [ ! -f "$file" ] && touch "$file"
   grep -q "export PYTHONPATH=$(pwd)" "$file" || echo "export PYTHONPATH=$(pwd)${PYTHONPATH:+:${PYTHONPATH}}" >> "$file"
 done
 grep -q "source $(pwd)/.venv/bin/activate" ~/.bashrc || echo "source $(pwd)/.venv/bin/activate" >> ~/.bashrc
-.venv/bin/pip install -r requirements.txt -r requirements-dev.txt 
-.venv/bin/pre-commit install
+
+uv lock
+uv sync --locked
+uv run pre-commit install
 npm --prefix client install

.github/workflows/build-extension.yml

@@ -10,15 +10,10 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - name: checkout repo
-        uses: actions/checkout@v4
-
-      - name: setup node
-        uses: actions/setup-node@v4
-
-      - name: clean install dependencies
-        run: cd client && npm ci    
-
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - uses: astral-sh/setup-uv@v3
+      - run: cd client && npm ci    
       - name: compile and create vsix
         run: |
           cd client
@@ -27,7 +22,6 @@ jobs:
           npm run compile 
           npm run webpack 
           npm run vscepack
-
       - name: upload vsix as artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/pre-commit.yml

@@ -6,15 +6,8 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
-    - name: Set up Python virtual environment
-      run: |
-        python -m venv .venv
-        source .venv/bin/activate
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt -r requirements-dev.txt
-    - name: Run pre-commit
-      run: |
-        source .venv/bin/activate
-        pre-commit run --all-files
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install
+      - run: uv sync --all-extras --locked --dev
+      - run: uv run pre-commit run --all-files

.github/workflows/python-tests.yml

@@ -3,18 +3,11 @@ name: Python Tests
 on: [push, pull_request]
 
 jobs:
-  pre-commit:
+  python-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
-    - name: Set up Python virtual environment
-      run: |
-        python -m venv .venv
-        source .venv/bin/activate
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt -r requirements-dev.txt
-    - name: Run tests
-      run: |
-        source .venv/bin/activate
-        pytest tests
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install
+      - run: uv sync --all-extras --locked --dev
+      - run: uv run pytest tests

README.md

@@ -26,8 +26,5 @@ code --force --install-extension PATH_TO_PACKAGES_EXTENSION.vsix
 ```
 Make sure to reload the VSCode window after installation.
 
-
 ### Copyright Note
-The `client` folder is essentially a modified copy of the `client` folder from https://github.com/QualiTorque/torque-vs-code-extensions
-
-The initial folder structure vscode setup and CI were also heavily influenced from the same repo.
+The typescript code is a modified copy of the `client` folder from https://github.com/QualiTorque/torque-vs-code-extensions which was licensed under Apache 2.0 License at the time the code was copied. Also, the initial folder structure, vscode setup, and CI were also heavily influenced from the same repo.

client/package.json

@@ -36,7 +36,7 @@
     ]
   },
   "scripts": {
-    "vscode:prepublish": "npm run compile && echo copying server && cp -Rf ../server/. out/server && cp ../*.md ./ && cp ../LICENSE ./LICENSE",
+    "vscode:prepublish": "./prepublish.sh",
     "compile": "tsc -b",
     "watch": "tsc -b -w",
     "webpack": "webpack --mode development",

client/prepublish.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -eu
+cp -Rf ../server/. ./out/server
+cp ../*.md ./
+cp ../LICENSE ./LICENSE
+uv export --no-emit-project --no-dev --format requirements-txt --frozen > ./out/server/requirements.txt
+npm run compile

pyproject.toml

@@ -1,3 +1,21 @@
+[project]
+version = "0.0.0"
+name = "venv"
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    "pygls",
+    "pyyaml"
+]
+
+[tool.uv]
+dev-dependencies = [
+  "pre-commit",
+  "ruff",
+  "pyright",
+  "pytest"
+]
+
 [tool.pyright]
 include = ["server"]
 useLibraryCodeForTypes = true