workers-py 1.1.5__tar.gz → 1.1.7__tar.gz

{workers_py-1.1.5 → workers_py-1.1.7}/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 <!-- version list -->
 
+## v1.1.7 (2025-08-28)
+
+### Bug Fixes
+
+- Check for venv python version mismatch
+  ([`c7871f0`](https://github.com/cloudflare/workers-py/commit/c7871f07dcc2ad54f0cd9e0243ff5107cf43d9c9))
+
+
+## v1.1.6 (2025-08-27)
+
+### Bug Fixes
+
+- Sync: if nothing to do, only warn if user requested directly
+  ([#26](https://github.com/cloudflare/workers-py/pull/26),
+  [`e142800`](https://github.com/cloudflare/workers-py/commit/e142800306cf4a021c10c629814265ed63d9cd90))
+
+
 ## v1.1.5 (2025-08-26)
 
 ### Bug Fixes

{workers_py-1.1.5 → workers_py-1.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-py
-Version: 1.1.5
+Version: 1.1.7
 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

{workers_py-1.1.5 → workers_py-1.1.7}/pyproject.toml

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

{workers_py-1.1.5 → workers_py-1.1.7}/src/pywrangler/cli.py

@@ -55,7 +55,7 @@ class ProxyToWranglerGroup(click.Group):
                 remaining_args = []
 
             if cmd_name in ["dev", "publish", "deploy", "versions"]:
-                ctx.invoke(sync_command, force=False)
+                ctx.invoke(sync_command, force=False, directly_requested=False)
 
             _proxy_to_wrangler(cmd_name, remaining_args)
             sys.exit(0)
@@ -92,7 +92,7 @@ def app(ctx, debug=False):
 
 @app.command("sync")
 @click.option("--force", is_flag=True, help="Force sync even if no changes detected")
-def sync_command(force=False):
+def sync_command(force=False, directly_requested=True):
     """
     Installs Python packages from pyproject.toml into src/vendor.
 
@@ -116,9 +116,10 @@ def sync_command(force=False):
     # Check if sync is needed based on file timestamps
     sync_needed = force or is_sync_needed()
     if not sync_needed:
-        logger.warning(
-            "pyproject.toml hasn't changed since last sync, use --force to ignore timestamp check"
-        )
+        if directly_requested:
+            logger.warning(
+                "pyproject.toml hasn't changed since last sync, use --force to ignore timestamp check"
+            )
         return
 
     # Check to make sure a wrangler config file exists.

{workers_py-1.1.5 → workers_py-1.1.7}/src/pywrangler/sync.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import shutil
 from pathlib import Path
 import tempfile
 
@@ -59,18 +60,66 @@ def _get_python_version():
     return os.environ.get("_PYWRANGLER_PYTHON_VERSION", "3.12")
 
 
+def _get_venv_python_version() -> str | None:
+    """
+    Retrieves the Python version from the virtual environment.
+
+    Returns:
+        The Python version string or None if it cannot be determined.
+    """
+    venv_python = (
+        VENV_WORKERS_PATH / "Scripts" / "python.exe"
+        if os.name == "nt"
+        else VENV_WORKERS_PATH / "bin" / "python"
+    )
+    if not venv_python.is_file():
+        return None
+
+    result = run_command(
+        [str(venv_python), "--version"], check=False, capture_output=True
+    )
+    if result.returncode != 0:
+        return None
+
+    return result.stdout.strip()
+
+
 def create_workers_venv():
     """
     Creates a virtual environment at `VENV_WORKERS_PATH` if it doesn't exist.
     """
+    wanted_python_version = _get_python_version()
+    logger.debug(f"Using python version: {wanted_python_version}")
+
     if VENV_WORKERS_PATH.is_dir():
-        logger.debug(f"Virtual environment at {VENV_WORKERS_PATH} already exists.")
-        return
+        installed_version = _get_venv_python_version()
+        if installed_version:
+            if wanted_python_version in installed_version:
+                logger.debug(
+                    f"Virtual environment at {VENV_WORKERS_PATH} already exists."
+                )
+                return
+
+            logger.warning(
+                f"Recreating virtual environment at {VENV_WORKERS_PATH} due to Python version mismatch. "
+                f"Found {installed_version}, expected {wanted_python_version}"
+            )
+        else:
+            logger.warning(
+                f"Could not determine python version for {VENV_WORKERS_PATH}, recreating."
+            )
+
+        shutil.rmtree(VENV_WORKERS_PATH)
 
     logger.debug(f"Creating virtual environment at {VENV_WORKERS_PATH}...")
-    python_version = _get_python_version()
     run_command(
-        ["uv", "venv", str(VENV_WORKERS_PATH), "--python", f"python{python_version}"]
+        [
+            "uv",
+            "venv",
+            str(VENV_WORKERS_PATH),
+            "--python",
+            f"python{wanted_python_version}",
+        ]
     )
 
 

{workers_py-1.1.5 → workers_py-1.1.7}/src/pywrangler/utils.py

@@ -50,7 +50,21 @@ def run_command(
     cwd: Path | None = None,
     env: dict | None = None,
     check: bool = True,
+    capture_output: bool = False,
 ):
+    """
+    Runs a command and handles logging and errors.
+
+    Args:
+        command: The command to run as a list of strings.
+        cwd: The working directory.
+        env: Environment variables.
+        check: If True, raise an exception on non-zero exit codes.
+        capture_output: If True, capture and return stdout/stderr.
+
+    Returns:
+        A subprocess.CompletedProcess instance.
+    """
     logger.log(RUNNING_LEVEL, f"{' '.join(str(arg) for arg in command)}")
     try:
         process = subprocess.run(
@@ -58,16 +72,15 @@ def run_command(
             cwd=cwd,
             env=env,
             check=check,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
+            capture_output=capture_output,
             text=True,
         )
-        if process.stdout:
+        if process.stdout and not capture_output:
             logger.log(OUTPUT_LEVEL, f"{process.stdout.strip()}")
         return process
     except subprocess.CalledProcessError as e:
         logger.error(
-            f"Error running command: {' '.join(str(arg) for arg in command)}\nExit code: {e.returncode}\nOutput:\n{e.stdout.strip()}"
+            f"Error running command: {' '.join(str(arg) for arg in command)}\nExit code: {e.returncode}\nOutput:\n{e.stdout.strip() if e.stdout else ''}{e.stderr.strip() if e.stderr else ''}"
         )
         raise click.exceptions.Exit(code=e.returncode)
     except FileNotFoundError:

{workers_py-1.1.5 → workers_py-1.1.7}/tests/test_cli.py

@@ -485,3 +485,60 @@ def test_sync_command_finds_pyproject_in_parent_directory(clean_test_dir):
     assert TEST_VENV_WORKERS.exists(), (
         f".venv-workers directory was not created at {TEST_VENV_WORKERS}"
     )
+
+
+def test_sync_recreates_venv_on_python_version_mismatch(clean_test_dir):
+    """
+    Test that the sync command recreates the venv if the Python version
+    mismatches, using real system commands.
+    """
+    # Create initial files in the clean test directory
+    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
+
+        # 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)
+
+        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."
+
+        # 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}"
+        )
+
+    finally:
+        os.chdir(original_dir)

{workers_py-1.1.5 → workers_py-1.1.7}/uv.lock

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