workers-py 1.2.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

pywrangler/metadata.py

@@ -0,0 +1,16 @@
+from typing import Literal, NamedTuple
+from datetime import datetime
+
+
+class PythonCompatVersion(NamedTuple):
+    version: Literal["3.12", "3.13"]
+    compat_flag: str
+    compat_date: datetime | None
+
+
+PYTHON_COMPAT_VERSIONS = [
+    PythonCompatVersion(
+        "3.13", "python_workers_20250116", datetime.strptime("2025-09-29", "%Y-%m-%d")
+    ),
+    PythonCompatVersion("3.12", "python_workers", None),
+]

pywrangler/sync.py

@@ -3,15 +3,18 @@ import os
 import shutil
 import tempfile
 from contextlib import contextmanager
+from datetime import datetime
 from pathlib import Path
 from typing import Literal
 
 import click
+import pyjson5
 
 from pywrangler.utils import (
     run_command,
     find_pyproject_toml,
 )
+from pywrangler.metadata import PYTHON_COMPAT_VERSIONS
 
 try:
     import tomllib  # Standard in Python 3.11+
@@ -60,15 +63,88 @@ def check_wrangler_config():
         raise click.exceptions.Exit(code=1)
 
 
+def _parse_wrangler_config() -> dict:
+    """
+    Parse wrangler configuration from either wrangler.toml or wrangler.jsonc.
+
+    Returns:
+        dict: Parsed configuration data
+    """
+    wrangler_toml = PROJECT_ROOT / "wrangler.toml"
+    wrangler_jsonc = PROJECT_ROOT / "wrangler.jsonc"
+
+    if wrangler_toml.is_file():
+        try:
+            with open(wrangler_toml, "rb") as f:
+                return tomllib.load(f)
+        except tomllib.TOMLDecodeError as e:
+            logger.error(f"Error parsing {wrangler_toml}: {e}")
+            raise click.exceptions.Exit(code=1)
+
+    if wrangler_jsonc.is_file():
+        try:
+            with open(wrangler_jsonc, "r") as f:
+                content = f.read()
+            return pyjson5.loads(content)
+        except (pyjson5.Json5DecoderError, ValueError) as e:
+            logger.error(f"Error parsing {wrangler_jsonc}: {e}")
+            raise click.exceptions.Exit(code=1)
+
+    return {}
+
+
 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'"
-            )
+    """
+    Determine Python version from wrangler configuration.
+
+    Returns:
+        Python version string
+    """
+    config = _parse_wrangler_config()
+
+    if not config:
+        logger.error("No wrangler config found")
+        raise click.exceptions.Exit(code=1)
+
+    compat_flags = config.get("compatibility_flags", [])
+
+    if "compatibility_date" not in config:
+        logger.error("No compatibility_date specified in wrangler config")
+        raise click.exceptions.Exit(code=1)
+    try:
+        compat_date = datetime.strptime(config.get("compatibility_date"), "%Y-%m-%d")
+    except ValueError:
+        logger.error(
+            f"Invalid compatibility_date format: {config.get('compatibility_date')}"
+        )
+        raise click.exceptions.Exit(code=1)
+
+    # Check if python_workers base flag is present (required for Python workers)
+    if "python_workers" not in compat_flags:
+        logger.error("`python_workers` compat flag not specified in wrangler config")
+        raise click.exceptions.Exit(code=1)
+
+    # Find the most specific Python version based on compat flags and date
+    # Sort by version descending to prioritize newer versions
+    sorted_versions = sorted(
+        PYTHON_COMPAT_VERSIONS, key=lambda x: x.version, reverse=True
+    )
+
+    for py_version in sorted_versions:
+        # Check if the specific compat flag is present
+        if py_version.compat_flag in compat_flags:
+            return py_version.version
+
+        # For versions with compat_date, also check the date requirement
+        if (
+            py_version.compat_date
+            and compat_date
+            and compat_date >= py_version.compat_date
+        ):
+            return py_version.version
+
+    logger.error("Could not determine Python version from wrangler config")
+    raise click.exceptions.Exit(code=1)
 
 
 def _get_uv_pyodide_interp_name():
@@ -118,7 +194,7 @@ 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}")
+    logger.debug(f"Using python version from wrangler config: {wanted_python_version}")
 
     if VENV_WORKERS_PATH.is_dir():
         installed_version = _get_venv_python_version()
@@ -152,6 +228,21 @@ def create_workers_venv():
     )
 
 
+MIN_UV_VERSION = (0, 8, 10)
+
+
+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
+    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():
     if PYODIDE_VENV_PATH.is_dir():
         logger.debug(
@@ -159,6 +250,7 @@ def create_pyodide_venv():
         )
         return
 
+    check_uv_version()
     logger.debug(f"Creating Pyodide virtual environment at {PYODIDE_VENV_PATH}...")
     PYODIDE_VENV_PATH.parent.mkdir(parents=True, exist_ok=True)
     interp_name = _get_uv_pyodide_interp_name()

{workers_py-1.2.0.dist-info → workers_py-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-py
-Version: 1.2.0
+Version: 1.3.0
 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
@@ -9,6 +9,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Requires-Dist: click<9.0.0,>=8.0.0
+Requires-Dist: pyjson5>=1.6.0
 Requires-Dist: pyodide-cli
 Requires-Dist: rich>=13.0.0
 Provides-Extra: build
@@ -29,7 +30,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 +61,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:
@@ -75,7 +76,14 @@ workers-py = { path = "../workers-py" }
 
 Then run via `uv run pywrangler`.
 
-## Tests
+#### Lint
+
+```
+uv run ruff check --fix
+uv run ruff format
+```
+
+#### Tests
 
 ```
 $ uv cache clean

workers_py-1.3.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+pywrangler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pywrangler/__main__.py,sha256=BnrUM7YiBmlM4HAn2MI9hP1kVNtzeK_kEgQhRy5HTq0,38
+pywrangler/cli.py,sha256=3hMjtOOib3HaTqCkuMGQe7MbBZNnim2ByHcDY4JxFlw,5091
+pywrangler/metadata.py,sha256=vttmaCtouSr9ADj8ncvNGqeaWEGFP8pamH2T6ohFjnA,408
+pywrangler/sync.py,sha256=ZzsRY8VsGOQufuQpJ0DxnPH3wXzTu5Myyh8wXs21oXA,12570
+pywrangler/utils.py,sha256=wfkT7GbKtgtjHXtV3AjNeb25ohdAfrprdZIlqqidiQU,3269
+workers_py-1.3.0.dist-info/METADATA,sha256=Xnj3ud5RhYdFFkndX_urC-jD3YWv_aUHQv2ckr_qiqA,1828
+workers_py-1.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+workers_py-1.3.0.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
+workers_py-1.3.0.dist-info/RECORD,,

workers_py-1.2.0.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=3hMjtOOib3HaTqCkuMGQe7MbBZNnim2ByHcDY4JxFlw,5091
-pywrangler/sync.py,sha256=4LbwXlzi7YXXhsgYT4unJOwX9DHSLI6sREcf7abJAks,9441
-pywrangler/utils.py,sha256=wfkT7GbKtgtjHXtV3AjNeb25ohdAfrprdZIlqqidiQU,3269
-workers_py-1.2.0.dist-info/METADATA,sha256=s9qthgJPRW1inmDvDDl_UR-V0KA-M_Hewwp6GJxjq04,1749
-workers_py-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-workers_py-1.2.0.dist-info/entry_points.txt,sha256=pt6X-Nv5-gSiKUwrnvLwzlSXs9yP37m7zdTAi8f6nAM,50
-workers_py-1.2.0.dist-info/RECORD,,