switch to uv

DetachHead · Nov 16, 2024 · 7aa2815 · 7aa2815
1 parent 529bb2c
commit 7aa2815
Show file tree

Hide file tree

Showing 15 changed files with 1,393 additions and 1,709 deletions.
diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
@@ -87,9 +87,7 @@ jobs:
           name: docstubs
           path: docstubs
 
-      - run: ./pw pdm use ${{ env.PYTHON_VERSION }} --first
-
-      - run: ./pw pdm install
+      - run: ./pw uv sync
 
       # using relative path for npm scripts because it needs to work in the package directories too
       - name: add pyprojectx and npm scripts to PATH
@@ -101,17 +99,18 @@ jobs:
       # ideally this should be run with the rest of the pytest tests in the validation workflow,
       # but they depend on the docstubs generated in the previous job
       - name: validate docstubs
-        run: pdm run test_python -- -m needs_all_docstubs
+        run: uv run npm run test-python -- -m needs_all_docstubs
 
       - id: current-version
+        # https://github.com/astral-sh/uv/issues/6298
         run: |
-          echo ::set-output name=CURRENT_VERSION::$(pdm show --version)
-          echo ::set-output name=CURRENT_UPSTREAM_VERSION::$(pdm run node -p "require(\"./package.json\").version")
+          echo ::set-output name=CURRENT_VERSION::$(./pw uv run python -c "from based_build.get_version import get_version;print(get_version())")
+          echo ::set-output name=CURRENT_UPSTREAM_VERSION::$(uv run node -p "require(\"./package.json\").version")
         working-directory: ${{ env.NPM_PACKAGE_DIR }}
 
       - name: get currently published npm package version
         if: github.ref == 'refs/heads/main'
-        run: echo ::set-output name=VERSION_INFO::$(pdm run npm view $(node -p "require(\"./package.json\").name")@=${{ steps.current-version.outputs.CURRENT_VERSION }})
+        run: echo ::set-output name=VERSION_INFO::$(uv run npm view $(node -p "require(\"./package.json\").name")@=${{ steps.current-version.outputs.CURRENT_VERSION }})
         id: version-was-changed
         working-directory: ${{ env.NPM_PACKAGE_DIR }}
 
@@ -122,7 +121,7 @@ jobs:
       - name: Build VSIX
         working-directory: ${{ env.VSIX_DIR }}
         run: |
-          pdm run npm run package
+          uv run npm run package
           mv basedpyright-*.vsix ${{ env.VSIX_NAME }}
 
       - uses: actions/upload-artifact@v4
@@ -133,7 +132,7 @@ jobs:
       # publish npm canary version on every push to every branch except main
       - name: set version for npm canary
         if: github.ref != 'refs/heads/main'
-        run: pdm run npm version ${{ steps.current-version.outputs.CURRENT_VERSION }}-$GITHUB_SHA --workspace ${{ env.NPM_PACKAGE_DIR }} --no-git-tag-version
+        run: uv run npm version ${{ steps.current-version.outputs.CURRENT_VERSION }}-$GITHUB_SHA --workspace ${{ env.NPM_PACKAGE_DIR }} --no-git-tag-version
       - name: publish package - npm canary
         if: github.ref != 'refs/heads/main'
         uses: JS-DevTools/npm-publish@v1
@@ -144,7 +143,7 @@ jobs:
           package: ${{ env.NPM_PACKAGE_DIR }}/package.json
       - name: set version for npm canary (browser)
         if: github.ref != 'refs/heads/main'
-        run: pdm run npm version ${{ steps.current-version.outputs.CURRENT_VERSION }}-$GITHUB_SHA --workspace ${{ env.BROWSER_NPM_PACKAGE_DIR }} --no-git-tag-version
+        run: uv run npm version ${{ steps.current-version.outputs.CURRENT_VERSION }}-$GITHUB_SHA --workspace ${{ env.BROWSER_NPM_PACKAGE_DIR }} --no-git-tag-version
       - name: publish package - npm canary (browser)
         if: github.ref != 'refs/heads/main'
         uses: JS-DevTools/npm-publish@v1
@@ -171,22 +170,22 @@ jobs:
           access: public
           package: ${{ env.BROWSER_NPM_PACKAGE_DIR }}/package.json
 
-      # this isn't ideal, but it's required becayse pdm publish re-builds the npm packages even tho they were already built earlier.
+      # this isn't ideal, but it's required becayse uv publish re-builds the npm packages even tho they were already built earlier.
       # i think to fix that i need to rewrite pdm_build.py to use the build hooks so we can control it more easily, but i can't get that to work soooo
       - name: set npm package versions back to upstream so pypi package can use it in --version output
         if: github.ref == 'refs/heads/main'
         run: npm version ${{ steps.current-version.outputs.CURRENT_UPSTREAM_VERSION }} --workspaces --no-git-tag-version
 
       - name: build package - pypi
-        run: pdm build
+        run: uv build
       - uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist
 
       - name: publish package - pypi
         if: github.ref == 'refs/heads/main' && steps.version-was-changed.outputs.VERSION_INFO == ''
-        run: pdm publish
+        run: uv publish
 
       # https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token
       - name: publish VSIX - visual studio marketplace

diff --git a/.github/workflows/deps.yaml b/.github/workflows/deps.yaml
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -43,14 +43,14 @@ jobs:
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
       - name: install dependencies
-        run: ./pw pdm install
+        run: ./pw uv sync
       - name: validate docs
-        run: ./pw pdm run mkdocs build --strict
+        run: ./pw uv run mkdocs build --strict
       - name: deploy dev docs
         if: github.ref == 'refs/heads/main'
-        run: ./pw pdm run mike deploy --push --update-aliases dev
+        run: ./pw uv run mike deploy --push --update-aliases dev
       - name: deploy release docs
         if: github.ref_type == 'tag'
         run: |
-          ./pw pdm run mike deploy --push --update-aliases ${{ github.ref_name }} latest
-          ./pw pdm run mike set-default --push latest
+          ./pw uv run mike deploy --push --update-aliases ${{ github.ref_name }} latest
+          ./pw uv run mike set-default --push latest
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -13,32 +13,30 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - run: ./pw pdm use ${{ env.PYTHON_VERSION }} --first
+      - run: ./pw uv venv --python ${{ env.PYTHON_VERSION }}
 
       # need to use pw script at least once even when activating the context so that the wrapper installs pyprojectx
-      - run: ./pw pdm lock --check
+      - run: ./pw uv sync --locked
 
       - name: activate pyprojectx context
         run: realpath ./.pyprojectx/main >> $GITHUB_PATH
 
-      - run: pdm install
-
       - name: typescript typecheck
-        run: pdm run npm run typecheck
+        run: uv run npm run typecheck
 
-      - run: pdm run npm run check
+      - run: uv run npm run check
 
       - name: python typecheck
-        run: pdm run typecheck
+        run: uv run npm run typecheck-python
 
       - name: ruff check
-        run: pdm run ruff check --output-format github
+        run: uv run ruff check --output-format github
 
       - name: ruff format
-        run: pdm run ruff format --check --diff
+        run: uv run ruff format --check --diff
 
       - name: pylint
-        run: pdm run pylint
+        run: uv run npm run pylint
 
   tests:
     strategy:
@@ -57,7 +55,7 @@ jobs:
         with:
           python-version: ${{env.PYTHON_VERSION}}
 
-      - run: ./pw pdm install
+      - run: ./pw uv sync
 
       # using relative path for npm scripts because it needs to work in the package directories too
       - name: add pyprojectx and npm scripts to PATH (linux)
@@ -73,7 +71,7 @@ jobs:
           echo "./node_modules/.bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
       - name: python tests
-        run: pdm run test_python -- -m "not needs_all_docstubs"
+        run: uv run npm run test-python -- -m "not needs_all_docstubs"
 
       - name: npm test (pyright-internal)
         run: npm test

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -11,7 +11,6 @@
         "tamasfe.even-better-toml",
         "redhat.vscode-yaml",
         "github.vscode-github-actions",
-        "gabdug.pdm",
         "Orta.vscode-jest"
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,7 +6,7 @@
         "focus": false,
         "panel": "shared"
     },
-    // tasks should be defined as either pdm or npm scripts where possible
+    // tasks should be defined npm scripts where possible
     "tasks": [
         {
             "label": "Watch extension",
@@ -80,7 +80,7 @@
           "label": "install dependencies",
           "type": "shell",
           "command": "./pw",
-          "args": ["pdm", "sync", "--clean", "-G", "dev", "-G", "docstubs", "-G", "lochelper"],
+          "args": ["uv", "sync"],
           "presentation": {
             "clear": true
           },

diff --git a/based_build/generateAllDocstubs.sh b/based_build/generateAllDocstubs.sh
@@ -1,10 +1,5 @@
-for pythonVersion in 3.13 3.12 3.11 3.10 3.9; do
-    ./pw pdm use $pythonVersion --first
-    ./pw pdm install --group=docstubs --no-self --no-default
-    ./pw pdm run generate_docstubs
-done
-for pythonVersion in 3.8; do
-    ./pw pdm use $pythonVersion --first
-    ./pw pdm install --group=docstubs-old --no-self --no-default --lockfile pdm.docstubs-old.lock
-    ./pw pdm run generate_docstubs
+for pythonVersion in 3.13 3.12 3.11 3.10 3.9 3.8; do
+    ./pw uv venv --python $pythonVersion
+    ./pw uv sync --only-group=docstubs --no-install-project
+    ./pw uv run npm run generate-docstubs
 done
diff --git a/docs/development/contributing.md b/docs/development/contributing.md
@@ -14,7 +14,7 @@ we recommend using vscode, as there are project configuration files in the repo
 
 1. hit `F1` > `Tasks: Run task` > `install dependencies`, or run the following command:
     ```
-    ./pw pdm install
+    ./pw uv sync
     ```
     this will install all dependencies required for the project (pyprojectx, pdm, node, typescript, etc.). all dependencies are installed locally to `./.venv` and `./node_modules`
 2. press "Yes" when prompted by vscode to use the newly created virtualenv

diff --git a/package.json b/package.json
@@ -17,7 +17,16 @@
         "typecheck": "npm exec --workspaces -- tsc --noEmit",
         "run:cli:windows": "npm run build:cli:dev && node packages/pyright/index.js --pythonpath .venv/Scripts/python.exe",
         "run:cli:unix": "npm run build:cli:dev && node packages/pyright/index.js --pythonpath .venv/bin/python",
-        "jest": "cd packages/pyright-internal && jest"
+        "jest": "cd packages/pyright-internal && jest",
+        "update-python-deps": "uv sync --upgrade",
+        "typecheck-python": "uv run --no-sync basedpyright",
+        "ruff-check": "uv run --no-sync ruff check && pw uv run --no-sync ruff format --check --diff",
+        "ruff-fix": "uv run --no-sync ruff check --fix && pw uv run --no-sync ruff format --fix",
+        "pylint": "uv run --no-sync pylint basedpyright based_build pdm_build.py",
+        "test-python": "uv run --no-sync pytest tests",
+        "generate-docstubs": "uv run --no-sync based_build/generate_docstubs.py",
+        "localization-helper": "uv run --no-sync based_build/localization_helper.py",
+        "docs": "uv run mkdocs serve"
     },
     "devDependencies": {
         "@detachhead/ts-helpers": "^16.2.0",