workers-py 1.1.8__py3-none-any.whl → 1.2.1__py3-none-any.whl

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.

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.dist-info → workers_py-1.2.1.dist-info}/METADATA

@@ -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.2.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+pywrangler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pywrangler/__main__.py,sha256=BnrUM7YiBmlM4HAn2MI9hP1kVNtzeK_kEgQhRy5HTq0,38
+pywrangler/cli.py,sha256=3hMjtOOib3HaTqCkuMGQe7MbBZNnim2ByHcDY4JxFlw,5091
+pywrangler/sync.py,sha256=zTX-zZ5OJ7701N07zGnE0GeSebXGeBKJlFRrhNwBy4M,9961
+pywrangler/utils.py,sha256=wfkT7GbKtgtjHXtV3AjNeb25ohdAfrprdZIlqqidiQU,3269
+workers_py-1.2.1.dist-info/METADATA,sha256=o50STsChreiwJ1o3SxrVVUM1vbz4yIrSPLPR495b1_s,1733
+workers_py-1.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+workers_py-1.2.1.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
+workers_py-1.2.1.dist-info/RECORD,,

workers_py-1.1.8.dist-info/RECORD

@@ -1,9 +0,0 @@
-pywrangler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywrangler/__main__.py,sha256=BnrUM7YiBmlM4HAn2MI9hP1kVNtzeK_kEgQhRy5HTq0,38
-pywrangler/cli.py,sha256=BnGGrdksWP-qBj-b0ipji-61Q0kZJohyr2KZZz-XG5s,5150
-pywrangler/sync.py,sha256=vcaL_jOWCC6vWEaJnTnbnxgdgFeW30pndRcMRWOv5pw,11286
-pywrangler/utils.py,sha256=wfkT7GbKtgtjHXtV3AjNeb25ohdAfrprdZIlqqidiQU,3269
-workers_py-1.1.8.dist-info/METADATA,sha256=rE874u2Io40CgLK1JPBMO5eMTwyychzO14K_jO5Emrc,1749
-workers_py-1.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-workers_py-1.1.8.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
-workers_py-1.1.8.dist-info/RECORD,,