workers-py 1.1.8__tar.gz → 1.2.1__tar.gz

{workers_py-1.1.8 → workers_py-1.2.1}/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 <!-- version list -->
 
+## v1.2.1 (2025-10-07)
+
+### Bug Fixes
+
+- Add version check for uv ([#36](https://github.com/cloudflare/workers-py/pull/36),
+  [`f9b16ab`](https://github.com/cloudflare/workers-py/commit/f9b16ab2cd08b0c5afe7e10b053f982d3d536633))
+
+### Documentation
+
+- Update README.md to use `uv tool`
+  ([`14770ae`](https://github.com/cloudflare/workers-py/commit/14770aea1c2bc2dd052c7f162f8fc4192815c550))
+
+
+## v1.2.0 (2025-09-26)
+
+### Features
+
+- Use uv instead of pyodide-build to manage pyodide install and venv
+  ([#30](https://github.com/cloudflare/workers-py/pull/30),
+  [`1629919`](https://github.com/cloudflare/workers-py/commit/16299198db73f1e3efb99eb6ef928fc46978acd9))
+
+
 ## v1.1.8 (2025-09-25)
 
 ### Bug Fixes

{workers_py-1.1.8 → workers_py-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-py
-Version: 1.1.8
+Version: 1.2.1
 Summary: A set of libraries and tools for Python Workers
 Project-URL: Homepage, https://github.com/cloudflare/workers-py
 Project-URL: Bug Tracker, https://github.com/cloudflare/workers-py/issues
@@ -29,7 +29,7 @@ A CLI tool for managing vendored packages in a Python Workers project.
 On Linux, you may be able to install the tool globally by running:
 
 ```
-uv pip install --system workers-py
+uv tool install workers-py
 ```
 
 Alternatively, you can add `workers-py` to your pyproject.toml:
@@ -60,7 +60,7 @@ uv run --project $REPO_ROOT $REPO_ROOT/src/pywrangler --help
 On Linux, to install it globally, you may also be able to run:
 
 ```
-uv pip install --system -e .
+uv tool install -e .
 ```
 
 Alternatively, you can add `workers-py` to your pyproject.toml:

{workers_py-1.1.8 → workers_py-1.2.1}/README.md

@@ -12,7 +12,7 @@ A CLI tool for managing vendored packages in a Python Workers project.
 On Linux, you may be able to install the tool globally by running:
 
 ```
-uv pip install --system workers-py
+uv tool install workers-py
 ```
 
 Alternatively, you can add `workers-py` to your pyproject.toml:
@@ -43,7 +43,7 @@ uv run --project $REPO_ROOT $REPO_ROOT/src/pywrangler --help
 On Linux, to install it globally, you may also be able to run:
 
 ```
-uv pip install --system -e .
+uv tool install -e .
 ```
 
 Alternatively, you can add `workers-py` to your pyproject.toml:

{workers_py-1.1.8 → workers_py-1.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "workers-py"
-version = "1.1.8"
+version = "1.2.1"
 description = "A set of libraries and tools for Python Workers"
 readme = "README.md"
 requires-python = ">=3.10"

{workers_py-1.1.8 → workers_py-1.2.1}/src/pywrangler/cli.py

@@ -106,7 +106,6 @@ def sync_command(force=False, directly_requested=True):
         create_pyodide_venv,
         create_workers_venv,
         parse_requirements,
-        install_pyodide_build,
         install_requirements,
     )
 
@@ -129,7 +128,6 @@ def sync_command(force=False, directly_requested=True):
     create_workers_venv()
 
     # Set up Pyodide virtual env
-    install_pyodide_build()
     create_pyodide_venv()
 
     # Generate requirements.txt from pyproject.toml by directly parsing the TOML file then install into vendor folder.

{workers_py-1.1.8 → workers_py-1.2.1}/src/pywrangler/sync.py

@@ -1,8 +1,10 @@
 import logging
 import os
 import shutil
-from pathlib import Path
 import tempfile
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Literal
 
 import click
 
@@ -58,8 +60,33 @@ def check_wrangler_config():
         raise click.exceptions.Exit(code=1)
 
 
-def _get_python_version():
-    return os.environ.get("_PYWRANGLER_PYTHON_VERSION", "3.12")
+def _get_python_version() -> Literal["3.12", "3.13"]:
+    res = os.environ.get("_PYWRANGLER_PYTHON_VERSION", "3.12")
+    match res:
+        case "3.12" | "3.13":
+            return res
+        case _:
+            raise ValueError(
+                f"Unexpected value for Python version '{res}', expected '3.12' or '3.13'"
+            )
+
+
+def _get_uv_pyodide_interp_name():
+    match _get_python_version():
+        case "3.12":
+            v = "3.12.7"
+        case "3.13":
+            v = "3.13.2"
+    return f"cpython-{v}-emscripten-wasm32-musl"
+
+
+def _get_pyodide_index():
+    match _get_python_version():
+        case "3.12":
+            v = "0.27.7"
+        case "3.13":
+            v = "0.28.3"
+    return "https://index.pyodide.org/" + v
 
 
 def _get_venv_python_version() -> str | None:
@@ -125,65 +152,34 @@ def create_workers_venv():
     )
 
 
-def _get_pyodide_cli_path():
-    venv_bin_path = VENV_WORKERS_PATH / ("Scripts" if os.name == "nt" else "bin")
-    pyodide_cli_path = venv_bin_path / ("pyodide.exe" if os.name == "nt" else "pyodide")
-    return pyodide_cli_path
+MIN_UV_VERSION = (0, 8, 10)
 
 
-def install_pyodide_build():
-    pyodide_cli_path = _get_pyodide_cli_path()
-
-    if pyodide_cli_path.is_file():
-        logger.debug(
-            f"pyodide-build CLI already found at {pyodide_cli_path} (skipping install.)"
-        )
+def check_uv_version():
+    res = run_command(["uv", "--version"], capture_output=True)
+    ver_str = res.stdout.split(" ")[1]
+    ver = tuple(int(x) for x in ver_str.split("."))
+    if ver >= MIN_UV_VERSION:
         return
-
-    logger.debug(
-        f"Installing pyodide-build in {VENV_WORKERS_PATH} using 'uv pip install'..."
-    )
-    venv_bin_path = pyodide_cli_path.parent
-
-    # Ensure the python executable path is correct for the venv
-    venv_python_executable = venv_bin_path / (
-        "python.exe" if os.name == "nt" else "python"
-    )
-    if not venv_python_executable.is_file():
-        logger.error(f"Python executable not found at {venv_python_executable}")
-        raise click.exceptions.Exit(code=1)
-
-    run_command(["uv", "pip", "install", "-p", str(venv_python_executable), "pip"])
-
-    run_command(
-        [
-            "uv",
-            "pip",
-            "install",
-            "-p",
-            str(venv_python_executable),
-            "pyodide-build==0.30.7",
-        ]
-    )
+    min_version_str = ".".join(str(x) for x in MIN_UV_VERSION)
+    logger.error(f"uv version at least {min_version_str} required, have {ver_str}.")
+    logger.error("Update uv with `uv self update`.")
+    raise click.exceptions.Exit(code=1)
 
 
 def create_pyodide_venv():
-    pyodide_cli_path = _get_pyodide_cli_path()
     if PYODIDE_VENV_PATH.is_dir():
         logger.debug(
             f"Pyodide virtual environment at {PYODIDE_VENV_PATH} already exists."
         )
         return
 
-    # Workaround to fix caching issue on some machines.
-    #
-    # Fix is here: pyodide/pyodide-build#239
-    logger.debug("Installing xbuildenv...")
-    run_command([str(pyodide_cli_path), "xbuildenv", "install"])
-
+    check_uv_version()
     logger.debug(f"Creating Pyodide virtual environment at {PYODIDE_VENV_PATH}...")
     PYODIDE_VENV_PATH.parent.mkdir(parents=True, exist_ok=True)
-    run_command([str(pyodide_cli_path), "venv", str(PYODIDE_VENV_PATH)])
+    interp_name = _get_uv_pyodide_interp_name()
+    run_command(["uv", "python", "install", interp_name])
+    run_command(["uv", "venv", PYODIDE_VENV_PATH, "--python", interp_name])
 
 
 def parse_requirements() -> list[str]:
@@ -202,6 +198,15 @@ def parse_requirements() -> list[str]:
         raise click.exceptions.Exit(code=1)
 
 
+@contextmanager
+def temp_requirements_file(requirements: list[str]):
+    # Write dependencies to a requirements.txt-style temp file.
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".txt") as temp_file:
+        temp_file.write("\n".join(requirements))
+        temp_file.flush()
+        yield temp_file.name
+
+
 def _install_requirements_to_vendor(requirements: list[str]):
     vendor_path = PROJECT_ROOT / "python_modules"
     logger.debug(f"Using vendor path: {vendor_path}")
@@ -212,97 +217,72 @@ def _install_requirements_to_vendor(requirements: list[str]):
         )
         return
 
-    # Write dependencies to a requirements.txt-style temp file.
-    with tempfile.NamedTemporaryFile(
-        mode="w", suffix=".txt", dir=PYODIDE_VENV_PATH
-    ) as temp_file:
-        temp_file.write("\n".join(requirements))
-        temp_file.flush()
-        temp_file_path = Path(temp_file.name)
-
-        # Install packages into vendor directory
-        vendor_path.mkdir(parents=True, exist_ok=True)
-        pyodide_venv_pip_path = (
-            PYODIDE_VENV_PATH
-            / ("Scripts" if os.name == "nt" else "bin")
-            / ("pip.exe" if os.name == "nt" else "pip")
-        )
-        relative_vendor_path = vendor_path.relative_to(PROJECT_ROOT)
-        logger.info(
-            f"Installing packages into [bold]{relative_vendor_path}[/bold] using Pyodide pip...",
-            extra={"markup": True},
-        )
+    # Install packages into vendor directory
+    vendor_path.mkdir(parents=True, exist_ok=True)
+    relative_vendor_path = vendor_path.relative_to(PROJECT_ROOT)
+    logger.info(
+        f"Installing packages into [bold]{relative_vendor_path}[/bold]...",
+        extra={"markup": True},
+    )
+    with temp_requirements_file(requirements) as requirements_file:
         run_command(
             [
-                str(pyodide_venv_pip_path),
+                "uv",
+                "pip",
                 "install",
-                "-t",
-                str(vendor_path),
+                "--no-build",
                 "-r",
-                str(temp_file_path),
-            ]
+                requirements_file,
+                "--extra-index-url",
+                _get_pyodide_index(),
+                "--index-strategy",
+                "unsafe-best-match",
+            ],
+            env=os.environ | {"VIRTUAL_ENV": PYODIDE_VENV_PATH},
+        )
+        pyv = _get_python_version()
+        shutil.rmtree(vendor_path)
+        shutil.copytree(
+            PYODIDE_VENV_PATH / f"lib/python{pyv}/site-packages", vendor_path
         )
 
-        # Create a pyvenv.cfg file in python_modules to mark it as a virtual environment
-        (vendor_path / "pyvenv.cfg").touch()
-        VENDOR_TOKEN.write_text("")
+    # Create a pyvenv.cfg file in python_modules to mark it as a virtual environment
+    (vendor_path / "pyvenv.cfg").touch()
+    VENDOR_TOKEN.touch()
 
-        logger.info(
-            f"Packages installed in [bold]{relative_vendor_path}[/bold].",
-            extra={"markup": True},
-        )
+    logger.info(
+        f"Packages installed in [bold]{relative_vendor_path}[/bold].",
+        extra={"markup": True},
+    )
 
 
 def _install_requirements_to_venv(requirements: list[str]):
     # Create a requirements file for .venv-workers that includes webtypy and pyodide-py
-    VENV_REQUIREMENTS_PATH.parent.mkdir(parents=True, exist_ok=True)
-
+    relative_venv_workers_path = VENV_WORKERS_PATH.relative_to(PROJECT_ROOT)
     requirements = requirements.copy()
     requirements.append("webtypy")
     requirements.append("pyodide-py")
 
-    # Write dependencies to a requirements.txt-style temp file.
-    with tempfile.NamedTemporaryFile(
-        mode="w", suffix=".txt", dir=VENV_REQUIREMENTS_PATH.parent
-    ) as temp_file:
-        temp_file.write("\n".join(requirements))
-        temp_file.flush()
-        temp_file_path = Path(temp_file.name)
-
-        # Install packages into .venv-workers so that user's IDE can see the packages.
-        venv_bin_path = VENV_WORKERS_PATH / ("Scripts" if os.name == "nt" else "bin")
-        venv_python_executable = venv_bin_path / (
-            "python.exe" if os.name == "nt" else "python"
+    logger.info(
+        f"Installing packages into [bold]{relative_venv_workers_path}[/bold]...",
+        extra={"markup": True},
+    )
+    with temp_requirements_file(requirements) as requirements_file:
+        run_command(
+            [
+                "uv",
+                "pip",
+                "install",
+                "-r",
+                requirements_file,
+            ],
+            env=os.environ | {"VIRTUAL_ENV": VENV_WORKERS_PATH},
         )
-
-        # For nicer logs, output the relative path.
-        relative_venv_workers_path = VENV_WORKERS_PATH.relative_to(PROJECT_ROOT)
-        if venv_python_executable.is_file():
-            logger.info(
-                f"Installing packages into [bold]{relative_venv_workers_path}[/bold] using uv pip...",
-                extra={"markup": True},
-            )
-            run_command(
-                [
-                    "uv",
-                    "pip",
-                    "install",
-                    "-p",
-                    venv_python_executable,
-                    "-r",
-                    str(temp_file_path),
-                ]
-            )
-            VENV_WORKERS_TOKEN.write_text("")
-            logger.info(
-                f"Packages installed in [bold]{relative_venv_workers_path}[/bold].",
-                extra={"markup": True},
-            )
-        else:
-            logger.warning(
-                f"Python executable not found at {venv_python_executable}. Skipping installation in [bold]{relative_venv_workers_path}[/bold].",
-                extra={"markup": True},
-            )
+    VENV_WORKERS_TOKEN.touch()
+    logger.info(
+        f"Packages installed in [bold]{relative_venv_workers_path}[/bold].",
+        extra={"markup": True},
+    )
 
 
 def install_requirements(requirements: list[str]):
@@ -310,6 +290,12 @@ def install_requirements(requirements: list[str]):
     _install_requirements_to_venv(requirements)
 
 
+def _is_out_of_date(token: Path, time: float) -> bool:
+    if not token.exists():
+        return True
+    return time > token.stat().st_mtime
+
+
 def is_sync_needed():
     """
     Checks if pyproject.toml has been modified since the last sync.
@@ -323,20 +309,6 @@ def is_sync_needed():
         return True
 
     pyproject_mtime = PYPROJECT_TOML_PATH.stat().st_mtime
-
-    # Check if .venv-workers exists and get its timestamp
-    if not VENV_WORKERS_TOKEN.exists():
-        return True
-
-    venv_mtime = VENV_WORKERS_TOKEN.stat().st_mtime
-    venv_needs_update = pyproject_mtime > venv_mtime
-    if venv_needs_update:
-        return True
-
-    # Check if vendor directory exists and get its timestamp
-    if not VENDOR_TOKEN.exists():
-        return True
-
-    vendor_mtime = VENDOR_TOKEN.stat().st_mtime
-    vendor_needs_update = pyproject_mtime > vendor_mtime
-    return vendor_needs_update
+    return _is_out_of_date(VENDOR_TOKEN, pyproject_mtime) or _is_out_of_date(
+        VENV_WORKERS_TOKEN, pyproject_mtime
+    )

{workers_py-1.1.8 → workers_py-1.2.1}/tests/test_cli.py

@@ -135,29 +135,17 @@ def test_sync_command_integration(dependencies, clean_test_dir):
 
     # Create a test wrangler.jsonc file
     create_test_wrangler_jsonc("src/worker.py")
+    project_root = Path.cwd().resolve()
 
-    # Save the current directory
-    original_dir = os.getcwd()
+    # Get the absolute path to the package root
+    # Run the pywrangler CLI directly using uvx
+    print("\nRunning pywrangler sync...")
+    sync_cmd = ["uvx", "--from", project_root, "pywrangler", "sync"]
 
-    try:
-        # Change to the test directory
-        os.chdir(TEST_DIR)
-
-        # Get the absolute path to the package root
-        project_root = Path(original_dir)
-
-        # Run the pywrangler CLI directly using uvx
-        print("\nRunning pywrangler sync...")
-        sync_cmd = ["uvx", "--from", str(project_root), "pywrangler", "sync"]
-
-        result = subprocess.run(sync_cmd, capture_output=True, text=True)
-        print(f"\nCommand output:\n{result.stdout}")
-        if result.stderr:
-            print(f"Command errors:\n{result.stderr}")
-
-    finally:
-        # Change back to the original directory
-        os.chdir(original_dir)
+    result = subprocess.run(sync_cmd, capture_output=True, text=True, cwd=TEST_DIR)
+    print(f"\nCommand output:\n{result.stdout}")
+    if result.stderr:
+        print(f"Command errors:\n{result.stderr}")
 
     # Check that the command succeeded
     assert result.returncode == 0, (
@@ -233,23 +221,12 @@ def test_sync_command_handles_missing_pyproject():
         assert not (temp_path / "pyproject.toml").exists()
 
         # Save original directory
-        original_dir = os.getcwd()
-
-        try:
-            # Change to temp directory
-            os.chdir(temp_path)
-
-            # Get the absolute path to the package root
-            project_root = Path(original_dir)
+        project_root = Path.cwd().resolve()
 
-            # Run pywrangler sync from the temp directory (should fail)
-            sync_cmd = ["uvx", "--from", str(project_root), "pywrangler", "sync"]
+        # Run pywrangler sync from the temp directory (should fail)
+        sync_cmd = ["uvx", "--from", project_root, "pywrangler", "sync"]
 
-            result = subprocess.run(sync_cmd, capture_output=True, text=True)
-
-        finally:
-            # Change back to original directory
-            os.chdir(original_dir)
+        result = subprocess.run(sync_cmd, capture_output=True, text=True, cwd=temp_path)
 
         # Check that the command failed with the expected error
         assert result.returncode != 0
@@ -447,27 +424,15 @@ def test_sync_command_finds_pyproject_in_parent_directory(clean_test_dir):
     subdir = TEST_DIR / "subproject"
     subdir.mkdir()
 
-    # Save the original directory
-    original_dir = os.getcwd()
-
-    try:
-        # Change to the subdirectory
-        os.chdir(subdir)
-
-        # Get the absolute path to the package root
-        project_root = Path(original_dir)
+    project_root = Path.cwd().resolve()
 
-        # Run the pywrangler CLI from the subdirectory
-        sync_cmd = ["uvx", "--from", str(project_root), "pywrangler", "sync"]
+    # Run the pywrangler CLI from the subdirectory
+    sync_cmd = ["uvx", "--from", project_root, "pywrangler", "sync"]
 
-        result = subprocess.run(sync_cmd, capture_output=True, text=True)
-        print(f"\nCommand output:\n{result.stdout}")
-        if result.stderr:
-            print(f"Command errors:\n{result.stderr}")
-
-    finally:
-        # Change back to the original directory
-        os.chdir(original_dir)
+    result = subprocess.run(sync_cmd, capture_output=True, text=True, cwd=subdir)
+    print(f"\nCommand output:\n{result.stdout}")
+    if result.stderr:
+        print(f"Command errors:\n{result.stderr}")
 
     # Check that the command succeeded
     assert result.returncode == 0, (
@@ -496,49 +461,45 @@ def test_sync_recreates_venv_on_python_version_mismatch(clean_test_dir):
     create_test_pyproject([])
     create_test_wrangler_jsonc()
 
-    original_dir = os.getcwd()
-    try:
-        os.chdir(clean_test_dir)
-        project_root = Path(original_dir)
-        sync_cmd = ["uvx", "--from", str(project_root), "pywrangler", "sync"]
-        venv_path = clean_test_dir / ".venv-workers"
-
-        # First run: Create venv with Python 3.12
-        print("\nRunning sync to create venv with Python 3.12...")
-        env = os.environ.copy()
-        env["_PYWRANGLER_PYTHON_VERSION"] = "3.12"
-        result1 = subprocess.run(sync_cmd, capture_output=True, text=True, env=env)
-
-        assert result1.returncode == 0, (
-            f"First sync failed: {result1.stdout}\n{result1.stderr}"
-        )
-        assert venv_path.exists(), "Venv was not created on the first run."
-        initial_mtime = venv_path.stat().st_mtime
+    project_root = Path.cwd().resolve()
 
-        # Second run: Recreate venv with Python 3.13
-        print("\nRunning sync to recreate venv with Python 3.13...")
-        env["_PYWRANGLER_PYTHON_VERSION"] = "3.13"
-        result2 = subprocess.run(sync_cmd, capture_output=True, text=True, env=env)
+    sync_cmd = ["uvx", "--from", project_root, "pywrangler", "sync"]
+    venv_path = clean_test_dir / ".venv-workers"
 
-        assert result2.returncode == 0, (
-            f"Second sync failed: {result2.stdout}\n{result2.stderr}"
-        )
-        assert venv_path.exists(), "Venv was not recreated."
-        final_mtime = venv_path.stat().st_mtime
+    # First run: Create venv with Python 3.12
+    print("\nRunning sync to create venv with Python 3.12...")
+    env = os.environ | {"_PYWRANGLER_PYTHON_VERSION": "3.12"}
+    result1 = subprocess.run(
+        sync_cmd, capture_output=True, text=True, env=env, cwd=clean_test_dir
+    )
 
-        # Check that the venv was actually modified
-        assert final_mtime > initial_mtime, "Venv modification time did not change."
+    assert result1.returncode == 0, (
+        f"First sync failed: {result1.stdout}\n{result1.stderr}"
+    )
+    assert venv_path.exists(), "Venv was not created on the first run."
+    initial_mtime = venv_path.stat().st_mtime
+
+    # Second run: Recreate venv with Python 3.13
+    print("\nRunning sync to recreate venv with Python 3.13...")
+    env = os.environ | {"_PYWRANGLER_PYTHON_VERSION": "3.13"}
+    result2 = subprocess.run(
+        sync_cmd, capture_output=True, text=True, env=env, cwd=clean_test_dir
+    )
 
-        # Verify the python version in the new venv is 3.13.
-        python_exe = venv_path / (
-            "Scripts/python.exe" if os.name == "nt" else "bin/python"
-        )
-        version_result = subprocess.run(
-            [str(python_exe), "--version"], capture_output=True, text=True
-        )
-        assert "3.13" in version_result.stdout, (
-            f"Python version is not 3.13: {version_result.stdout}"
-        )
+    assert result2.returncode == 0, (
+        f"Second sync failed: {result2.stdout}\n{result2.stderr}"
+    )
+    assert venv_path.exists(), "Venv was not recreated."
+    final_mtime = venv_path.stat().st_mtime
+
+    # Check that the venv was actually modified
+    assert final_mtime > initial_mtime, "Venv modification time did not change."
 
-    finally:
-        os.chdir(original_dir)
+    # Verify the python version in the new venv is 3.13.
+    python_exe = venv_path / ("Scripts/python.exe" if os.name == "nt" else "bin/python")
+    version_result = subprocess.run(
+        [python_exe, "--version"], capture_output=True, text=True, cwd=clean_test_dir
+    )
+    assert "3.13" in version_result.stdout, (
+        f"Python version is not 3.13: {version_result.stdout}"
+    )

{workers_py-1.1.8 → workers_py-1.2.1}/uv.lock

@@ -522,7 +522,7 @@ wheels = [
 
 [[package]]
 name = "workers-py"
-version = "1.1.8"
+version = "1.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "click", version = "8.1.8", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" },