pytest-devant-cloud 0.1.0__tar.gz → 0.1.1__tar.gz

{pytest_devant_cloud-0.1.0 → pytest_devant_cloud-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-devant-cloud
-Version: 0.1.0
+Version: 0.1.1
 Summary: pytest plugin that streams runs, results, and step trees to Devant Cloud's /v1/runs API.
 Project-URL: Homepage, https://github.com/devant-net/devq-cloud/tree/main/packages/pytest-devant-cloud
 Project-URL: Repository, https://github.com/devant-net/devq-cloud

{pytest_devant_cloud-0.1.0 → pytest_devant_cloud-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pytest-devant-cloud"
-version = "0.1.0"
+version = "0.1.1"
 description = "pytest plugin that streams runs, results, and step trees to Devant Cloud's /v1/runs API."
 readme = "README.md"
 license = { file = "LICENSE" }

{pytest_devant_cloud-0.1.0 → pytest_devant_cloud-0.1.1}/src/pytest_devant_cloud/plugin.py

@@ -9,7 +9,7 @@ Why these hooks (sourced from pytest 9.x reference docs):
                                   the run yet — we want to know the test
                                   count from collection first.
   * pytest_sessionstart         — `POST /v1/runs` once collection has happened
-                                  (unless DEVQ_RUN_ID is set; then we attach
+                                  (unless DEVANT_CLOUD_RUN_ID is set; then we attach
                                   to an externally-owned run).
   * pytest_runtest_makereport   — wrapper hook that stashes the phase report
                                   (setup/call/teardown) on the item, so the
@@ -82,26 +82,26 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         "--devant-api-url",
         action="store",
         default=None,
-        help="Devant Cloud API URL (env: DEVQ_API_URL)",
+        help="Devant Cloud API URL (env: DEVANT_CLOUD_API_URL)",
     )
     group.addoption(
         "--devant-token",
         action="store",
         default=None,
-        help="Bearer token (env: DEVQ_TOKEN)",
+        help="Bearer token (env: DEVANT_CLOUD_TOKEN)",
     )
     group.addoption(
         "--devant-project-id",
         action="store",
         type=int,
         default=None,
-        help="Project id (env: DEVQ_PROJECT_ID)",
+        help="Project id (env: DEVANT_CLOUD_PROJECT_ID)",
     )
     group.addoption(
         "--devant-run-name",
         action="store",
         default=None,
-        help="Run display name (env: DEVQ_RUN_NAME)",
+        help="Run display name (env: DEVANT_CLOUD_RUN_NAME)",
     )
     group.addoption(
         "--devant-run-id",
@@ -109,7 +109,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         type=int,
         default=None,
         help="Attach to an externally created run instead of creating one "
-        "(env: DEVQ_RUN_ID)",
+        "(env: DEVANT_CLOUD_RUN_ID)",
     )
     group.addoption(
         "--devant-disable",
@@ -119,13 +119,38 @@ def pytest_addoption(parser: pytest.Parser) -> None:
     )
 
 
-def _opt(config: pytest.Config, cli: str, env: str, default: Any) -> Any:
-    """CLI flag wins, then env var, then default."""
+_warned_legacy_env: set[str] = set()
+
+
+def _opt(
+    config: pytest.Config,
+    cli: str,
+    env: str,
+    default: Any,
+    *,
+    legacy_env: str | None = None,
+) -> Any:
+    """CLI flag wins, then canonical env var, then legacy env var (with a
+    one-time deprecation warning), then default.
+
+    The legacy_env parameter exists so historical DEVQ_* env vars keep working
+    while we transition to the DEVANT_CLOUD_* names. Will be dropped in a
+    future major release.
+    """
     v = config.getoption(cli, default=None)
     if v is not None:
         return v
     if env in os.environ and os.environ[env] != "":
         return os.environ[env]
+    if legacy_env and legacy_env in os.environ and os.environ[legacy_env] != "":
+        if legacy_env not in _warned_legacy_env:
+            _warned_legacy_env.add(legacy_env)
+            sys.stderr.write(
+                f'[devant] env var "{legacy_env}" is deprecated; please use '
+                f'"{env}" instead. Both work today; the legacy name will be '
+                "removed in a future major release.\n"
+            )
+        return os.environ[legacy_env]
     return default
 
 
@@ -145,15 +170,24 @@ def pytest_configure(config: pytest.Config) -> None:
         return
 
     api_url = _opt(
-        config, "--devant-api-url", "DEVQ_API_URL", "http://localhost:32124"
+        config,
+        "--devant-api-url",
+        "DEVANT_CLOUD_API_URL",
+        "http://localhost:32124",
+        legacy_env="DEVQ_API_URL",
     )
-    api_token_explicit = (
-        config.getoption("--devant-token", default=None)
-        or os.environ.get("DEVQ_TOKEN")
+    api_token_explicit = config.getoption("--devant-token", default=None) or _opt(
+        config, "--devant-token", "DEVANT_CLOUD_TOKEN", None, legacy_env="DEVQ_TOKEN"
     )
     api_token = api_token_explicit or "dev-admin-token"
 
-    project_raw = _opt(config, "--devant-project-id", "DEVQ_PROJECT_ID", 1)
+    project_raw = _opt(
+        config,
+        "--devant-project-id",
+        "DEVANT_CLOUD_PROJECT_ID",
+        1,
+        legacy_env="DEVQ_PROJECT_ID",
+    )
     try:
         project_id = int(project_raw)
     except (TypeError, ValueError):
@@ -161,8 +195,8 @@ def pytest_configure(config: pytest.Config) -> None:
     if project_id <= 0:
         # Don't blow up the test run — just refuse to enable the plugin.
         sys.stderr.write(
-            "[devant] DEVQ_PROJECT_ID must be a positive integer; reporter "
-            "disabled for this run\n"
+            "[devant] DEVANT_CLOUD_PROJECT_ID must be a positive integer; "
+            "reporter disabled for this run\n"
         )
         return
 
@@ -185,19 +219,26 @@ def pytest_configure(config: pytest.Config) -> None:
         )
         if not is_local:
             sys.stderr.write(
-                f'[devant] DEVQ_TOKEN is not set; falling back to "dev-admin-token" '
-                f"against {api_url}. Set DEVQ_TOKEN to a real CI token for "
-                "production use.\n"
+                f'[devant] DEVANT_CLOUD_TOKEN is not set; falling back to '
+                f'"dev-admin-token" against {api_url}. Set DEVANT_CLOUD_TOKEN '
+                "to a real CI token for production use.\n"
             )
 
     run_name = _opt(
         config,
         "--devant-run-name",
-        "DEVQ_RUN_NAME",
+        "DEVANT_CLOUD_RUN_NAME",
         f"pytest — {_dt.datetime.now(_dt.timezone.utc).isoformat(timespec='seconds')}",
+        legacy_env="DEVQ_RUN_NAME",
     )
 
-    external_run_raw = _opt(config, "--devant-run-id", "DEVQ_RUN_ID", None)
+    external_run_raw = _opt(
+        config,
+        "--devant-run-id",
+        "DEVANT_CLOUD_RUN_ID",
+        None,
+        legacy_env="DEVQ_RUN_ID",
+    )
     external_run_id: int | None = None
     if external_run_raw not in (None, ""):
         try: