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

pywrangler/__init__.py

@@ -1 +0,0 @@
-

pywrangler/sync.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import shutil
 from pathlib import Path
 import tempfile
 
@@ -21,7 +22,9 @@ logger = logging.getLogger(__name__)
 PYPROJECT_TOML_PATH = find_pyproject_toml()
 PROJECT_ROOT = PYPROJECT_TOML_PATH.parent
 VENV_WORKERS_PATH = PROJECT_ROOT / ".venv-workers"
+VENV_WORKERS_TOKEN = PROJECT_ROOT / ".venv-workers/.synced"
 PYODIDE_VENV_PATH = VENV_WORKERS_PATH / "pyodide-venv"
+VENDOR_TOKEN = PROJECT_ROOT / "python_modules/.synced"
 VENV_REQUIREMENTS_PATH = VENV_WORKERS_PATH / "temp-venv-requirements.txt"
 
 
@@ -59,18 +62,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}",
+        ]
     )
 
 
@@ -194,6 +245,7 @@ def _install_requirements_to_vendor(requirements: list[str]):
 
         # Create a pyvenv.cfg file in python_modules to mark it as a virtual environment
         (vendor_path / "pyvenv.cfg").touch()
+        VENDOR_TOKEN.write_text("")
 
         logger.info(
             f"Packages installed in [bold]{relative_vendor_path}[/bold].",
@@ -241,6 +293,7 @@ def _install_requirements_to_venv(requirements: list[str]):
                     str(temp_file_path),
                 ]
             )
+            VENV_WORKERS_TOKEN.write_text("")
             logger.info(
                 f"Packages installed in [bold]{relative_venv_workers_path}[/bold].",
                 extra={"markup": True},
@@ -272,19 +325,18 @@ def is_sync_needed():
     pyproject_mtime = PYPROJECT_TOML_PATH.stat().st_mtime
 
     # Check if .venv-workers exists and get its timestamp
-    if not VENV_WORKERS_PATH.is_dir():
+    if not VENV_WORKERS_TOKEN.exists():
         return True
 
-    venv_mtime = VENV_WORKERS_PATH.stat().st_mtime
+    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
-    vendor_path = PROJECT_ROOT / "python_modules"
-    if not vendor_path.is_dir():
+    if not VENDOR_TOKEN.exists():
         return True
 
-    vendor_mtime = vendor_path.stat().st_mtime
+    vendor_mtime = VENDOR_TOKEN.stat().st_mtime
     vendor_needs_update = pyproject_mtime > vendor_mtime
     return vendor_needs_update

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-py
-Version: 1.1.6
+Version: 1.1.8
 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
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 A set of libraries and tools for Python Workers.
 
 
-## Pywrangler 
+## Pywrangler
 
 A CLI tool for managing vendored packages in a Python Workers project.
 

workers_py-1.1.8.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=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,,

workers_py-1.1.6.dist-info/RECORD

@@ -1,9 +0,0 @@
-pywrangler/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pywrangler/__main__.py,sha256=BnrUM7YiBmlM4HAn2MI9hP1kVNtzeK_kEgQhRy5HTq0,38
-pywrangler/cli.py,sha256=BnGGrdksWP-qBj-b0ipji-61Q0kZJohyr2KZZz-XG5s,5150
-pywrangler/sync.py,sha256=80pPCz-DTTAk5xTQ0j4ufrh3wv1nQ8y_-zpdPkaLVfw,9740
-pywrangler/utils.py,sha256=6mR3kst-Y0w1DMQc5LQ2M9xiNWcVezctTKIWXKQXMJ8,2781
-workers_py-1.1.6.dist-info/METADATA,sha256=rI1Ka0dZmdZPfLyanLGulrUewvzy0wnWeUZi9sMdMCI,1750
-workers_py-1.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-workers_py-1.1.6.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
-workers_py-1.1.6.dist-info/RECORD,,