Skip to content

ref: remove devenv-managed uv #107810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshuarli wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −47
Open

ref: remove devenv-managed uv #107810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions devenv/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
[devenv]
minimum_version = 1.14.2

[uv]
darwin_arm64 = https://github.com/astral-sh/uv/releases/download/0.9.28/uv-aarch64-apple-darwin.tar.gz
darwin_arm64_sha256 = 12163fe09eb292d3ad1ea0f132a84485c902e2ff360d57562bf676e6615fcba0
darwin_x86_64 = https://github.com/astral-sh/uv/releases/download/0.9.28/uv-x86_64-apple-darwin.tar.gz
darwin_x86_64_sha256 = 3a8030881d13b824e5168f5e4d060e715e40753249766bda3d52d6771d93b169
linux_arm64 = https://github.com/astral-sh/uv/releases/download/0.9.28/uv-aarch64-unknown-linux-gnu.tar.gz
linux_arm64_sha256 = 382c342735ff29f8ba4574d88e39bca798bcbac50bff6742710ca9cd8143e7d2
linux_x86_64 = https://github.com/astral-sh/uv/releases/download/0.9.28/uv-x86_64-unknown-linux-gnu.tar.gz
linux_x86_64_sha256 = 66ad1822dd9cf96694b95c24f25bc05cff417a65351464da01682a91796d1f2b
# used for autoupdate
# NOTE: when bumping, please also update versions for astral-sh/setup-uv github action accordingly
version = 0.9.28
minimum_version = 1.22.0

[node]
# upstream (https://nodejs.org/dist/) is not reliable enough
Expand Down
36 changes: 3 additions & 33 deletions devenv/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from __future__ import annotations

import importlib.metadata
import json
import os
import shlex
Expand Down Expand Up @@ -73,16 +72,6 @@ def run_procs(
return all_good


# Temporary, see https://github.com/getsentry/sentry/pull/78881
def check_minimum_version(minimum_version: str) -> bool:
version = importlib.metadata.version("sentry-devenv")

parsed_version = tuple(map(int, version.split(".")))
parsed_minimum_version = tuple(map(int, minimum_version.split(".")))

return parsed_version >= parsed_minimum_version


def installed_pnpm(version: str, binroot: str) -> bool:
if shutil.which("pnpm", path=binroot) != f"{binroot}/pnpm" or not os.path.exists(
f"{binroot}/node-env/bin/pnpm"
Expand Down Expand Up @@ -119,20 +108,6 @@ def install_pnpm(version: str, reporoot: str) -> None:


def main(context: dict[str, str]) -> int:
minimum_version = "1.22.0"
if not check_minimum_version(minimum_version):
raise SystemExit(
f"""
In order to use uv, devenv must be at least version {minimum_version}.

Please run the following to update your global devenv:
devenv update

Then, use it to run sync this time:
{constants.root}/bin/devenv sync
"""
)

repo = context["repo"]
reporoot = context["reporoot"]
cfg = config.get_repo(reporoot)
Expand All @@ -148,14 +123,9 @@ def main(context: dict[str, str]) -> int:
colima.uninstall(binroot)
limactl.uninstall(binroot)

from devenv.lib import uv

uv.install(
cfg["uv"]["version"],
cfg["uv"][constants.SYSTEM_MACHINE],
cfg["uv"][f"{constants.SYSTEM_MACHINE}_sha256"],
reporoot,
)
if not shutil.which("uv"):
print("\n\n\ndevenv is no longer managing uv; please run `brew install uv`.\n\n\n")
return 1

from devenv.lib import node

Expand Down
Loading