Merge pull request #601 from posit-dev/worktree-workbench-preview-channel

Add preview channel for workbench products; fix matrix+dev exclusion

Author: ianpittwood

posit-bakery/posit_bakery/cli/ci.py

@@ -140,12 +140,13 @@ def matrix(
         for img in images:
             entry = {"image": img.name}
             versions = img.versions
-            if (img.matrix is None and matrix_versions == MatrixVersionInclusionEnum.ONLY) or (
-                img.matrix is not None and matrix_versions == MatrixVersionInclusionEnum.EXCLUDE
-            ):
+            if img.matrix is None and matrix_versions == MatrixVersionInclusionEnum.ONLY:
                 continue
-            elif img.matrix is not None and matrix_versions != MatrixVersionInclusionEnum.EXCLUDE:
-                versions = img.matrix.to_image_versions()
+            elif img.matrix is not None:
+                if matrix_versions != MatrixVersionInclusionEnum.EXCLUDE:
+                    versions = img.matrix.to_image_versions()
+                # If EXCLUDE: fall through using img.versions (devVersions are appended
+                # there by load_dev_versions). The dev_versions filter below handles the rest.
             for ver in versions:
                 included, _ = ver.matches_dev_filter(dev_versions, dev_channel)
                 if not included:

posit-bakery/posit_bakery/config/config.py

@@ -266,6 +266,10 @@ def version_matches(ver_name: str, filter_version: str) -> bool:
     ver = ParsedVersion.parse(ver_name)
     filt = ParsedVersion.parse(filter_version)
     if ver is not None and filt is not None:
+        if ver.dep_versions is not None or filt.dep_versions is not None:
+            if ver.dep_versions is None or filt.dep_versions is None:
+                return False
+            return ver.dep_versions[: len(filt.dep_versions)] == filt.dep_versions
         return ver.release[: len(filt.release)] == filt.release and (
             filt.prerelease is None or ver.prerelease == filt.prerelease
         )

posit-bakery/posit_bakery/config/image/parsed_version.py

@@ -10,23 +10,34 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
+from posit_bakery.config.dependencies.const import SupportedDependencies
+
 # Local under TYPE_CHECKING to avoid a circular import: version.py imports
 # this module at runtime, so importing ImageVersion eagerly would cycle.
 if TYPE_CHECKING:
     from posit_bakery.config.image.version import ImageVersion
 
 log = logging.getLogger(__name__)
 
-# Anchored grammar:
+# Alternation of known dependency name prefixes, longest first.
+_DEP_ALT = "|".join(re.escape(d.value) for d in sorted(SupportedDependencies, key=lambda d: len(d.value), reverse=True))
+
+# Anchored grammar (calver/semver — no dep prefix):
 #   <release>      one or more dot-separated digit groups, minimum two groups
 #   -<prerelease>  optional, semver prerelease alphabet
 #   +<build>       optional, semver build alphabet
-_VERSION_RE = re.compile(
+_CALVER_RE = re.compile(
     r"^(?P<release>\d+(?:\.\d+)+)"
     r"(?:-(?P<prerelease>[0-9A-Za-z.-]+))?"
     r"(?:\+(?P<build>[0-9A-Za-z.-]+))?$"
 )
 
+# Dep-prefixed version grammar (e.g. "R4.3.3" or "R4.3.3-python3.13.14"):
+#   one or more {dep-name}{release} components separated by hyphens
+_SINGLE_DEP = r"(?:" + _DEP_ALT + r")\d+(?:\.\d+)+"
+_MATRIX_RE = re.compile(r"^" + _SINGLE_DEP + r"(?:-" + _SINGLE_DEP + r")*$")
+_DEP_PAIR_RE = re.compile(r"(?P<dep>" + _DEP_ALT + r")(?P<version>\d+(?:\.\d+)+)")
+
 
 @dataclass(frozen=True)
 class ParsedVersion:
@@ -43,6 +54,8 @@ class ParsedVersion:
     release: tuple[int, ...]
     prerelease: str | None = None
     build: str | None = None
+    # Non-None for dep-prefixed strings; each entry is (dep_name, version_tuple).
+    dep_versions: tuple[tuple[str, tuple[int, ...]], ...] | None = None
 
     def __str__(self) -> str:
         return self.original
@@ -53,17 +66,23 @@ def parse(cls, value: str) -> "ParsedVersion | None":
         if not isinstance(value, str):
             log.warning("Unparseable version string: %r", value)
             return None
-        match = _VERSION_RE.match(value)
-        if match is None:
-            log.warning("Unparseable version string: %r", value)
-            return None
-        release = tuple(int(part) for part in match.group("release").split("."))
-        return cls(
-            original=value,
-            release=release,
-            prerelease=match.group("prerelease"),
-            build=match.group("build"),
-        )
+        match = _CALVER_RE.match(value)
+        if match is not None:
+            release = tuple(int(part) for part in match.group("release").split("."))
+            return cls(
+                original=value,
+                release=release,
+                prerelease=match.group("prerelease"),
+                build=match.group("build"),
+            )
+        if _MATRIX_RE.match(value):
+            pairs = tuple(
+                (m.group("dep"), tuple(int(x) for x in m.group("version").split(".")))
+                for m in _DEP_PAIR_RE.finditer(value)
+            )
+            return cls(original=value, release=pairs[0][1], dep_versions=pairs)
+        log.warning("Unparseable version string: %r", value)
+        return None
 
     def _release_key(self, length: int) -> tuple[int, ...]:
         """Zero-pad ``self.release`` to ``length`` for length-tolerant comparison."""

posit-bakery/posit_bakery/config/image/posit_product/const.py

@@ -52,7 +52,8 @@ class ReleaseChannelEnum(str, Enum):
 PRODUCT_RELEASE_CHANNEL_SUPPORT_MAP = {
     ProductEnum.CONNECT: [ReleaseChannelEnum.RELEASE, ReleaseChannelEnum.DAILY],
     ProductEnum.PACKAGE_MANAGER: [ReleaseChannelEnum.RELEASE, ReleaseChannelEnum.PREVIEW, ReleaseChannelEnum.DAILY],
-    ProductEnum.WORKBENCH: [ReleaseChannelEnum.RELEASE, ReleaseChannelEnum.DAILY],
+    ProductEnum.WORKBENCH: [ReleaseChannelEnum.RELEASE, ReleaseChannelEnum.PREVIEW, ReleaseChannelEnum.DAILY],
+    ProductEnum.WORKBENCH_SESSION: [ReleaseChannelEnum.RELEASE, ReleaseChannelEnum.PREVIEW, ReleaseChannelEnum.DAILY],
 }
 
 PRODUCT_RELEASE_STREAM_SUPPORT_MAP = PRODUCT_RELEASE_CHANNEL_SUPPORT_MAP  # deprecated alias, remove in Phase 0.5c

posit-bakery/posit_bakery/config/image/posit_product/main.py

@@ -232,6 +232,17 @@ def get(self, metadata: dict, version_override: str | None = None) -> ReleaseCha
                 ),
             },
         ),
+        ReleaseChannelEnum.PREVIEW: ReleaseChannelPath(
+            WORKBENCH_DAILY_URL,
+            {
+                "version": resolvers.StringMapPathResolver(
+                    ["products", "workbench", "platforms", "{download_json_os}-{arch_identifier}", "version"]
+                ),
+                "download_url": resolvers.StringMapPathResolver(
+                    ["products", "workbench", "platforms", "{download_json_os}-{arch_identifier}", "link"]
+                ),
+            },
+        ),
         ReleaseChannelEnum.DAILY: ReleaseChannelPath(
             WORKBENCH_DAILY_URL,
             {
@@ -256,6 +267,17 @@ def get(self, metadata: dict, version_override: str | None = None) -> ReleaseCha
                 ),
             },
         ),
+        ReleaseChannelEnum.PREVIEW: ReleaseChannelPath(
+            WORKBENCH_DAILY_URL,
+            {
+                "version": resolvers.StringMapPathResolver(
+                    ["products", "session", "platforms", "{download_json_os}-{arch_identifier}", "version"]
+                ),
+                "download_url": resolvers.StringMapPathResolver(
+                    ["products", "session", "platforms", "{download_json_os}-{arch_identifier}", "link"]
+                ),
+            },
+        ),
         ReleaseChannelEnum.DAILY: ReleaseChannelPath(
             WORKBENCH_DAILY_URL,
             {

posit-bakery/test/cli/test_ci.py

@@ -144,6 +144,7 @@ class TestVersionMatches:
             ("2026.03.1", "2026.03"),
             ("2026.05.0-dev+15-gSHA", "2026.05.0-dev"),
             ("R4.5.3-python3.14.3", "R4.5.3-python3.14.3"),
+            ("R4.5.3-python3.14.3", "R4.5.3"),
         ],
     )
     def test_matches(self, ver_name, filter_version):

posit-bakery/test/config/image/test_parsed_version.py

@@ -18,7 +18,6 @@ class TestParseUnparseable:
         [
             "",
             "latest",
-            "R4.3.3-python3.11.15",
             "v1.2.3",
             "not a version",
             "1",  # only one release component
@@ -59,6 +58,10 @@ class TestParseRoundtrip:
             ("2026.4.0-rc.1", (2026, 4, 0), "rc.1", None),
             # Edge: build only.
             ("2026.4.0+abc", (2026, 4, 0), None, "abc"),
+            # Dep-prefixed: single and compound matrix versions.
+            ("R4.3.3", (4, 3, 3), None, None),
+            ("python3.13.14", (3, 13, 14), None, None),
+            ("R4.3.3-python3.11.15", (4, 3, 3), None, None),
         ],
     )
     def test_parses_and_roundtrips(self, value, release, prerelease, build, caplog):
@@ -185,3 +188,26 @@ def mock_iv(name: str, *, is_matrix: bool = False) -> MagicMock:
         # (Python's sort is stable). Parseable entries follow in ascending order.
         assert names[:2] == ["R4.3.3-python3.11.15", "garbage"]
         assert names[2:] == ["2026.04.0", "2026.04.1", "2026.05.0-dev+62-g1ca9367735"]
+
+
+class TestDepVersions:
+    @pytest.mark.parametrize(
+        "value,expected",
+        [
+            ("R4.3.3", (("R", (4, 3, 3)),)),
+            ("python3.13.14", (("python", (3, 13, 14)),)),
+            ("R4.3.3-python3.11.15", (("R", (4, 3, 3)), ("python", (3, 11, 15)))),
+            ("R4.3-python3.11-quarto1.4", (("R", (4, 3)), ("python", (3, 11)), ("quarto", (1, 4)))),
+        ],
+    )
+    def test_dep_versions_populated(self, value, expected, caplog):
+        caplog.set_level(logging.WARNING)
+        parsed = ParsedVersion.parse(value)
+        assert parsed is not None
+        assert parsed.dep_versions == expected
+        assert not [r for r in caplog.records if r.levelno >= logging.WARNING]
+
+    def test_pure_calver_has_no_dep_versions(self):
+        parsed = ParsedVersion.parse("2026.04.0-dev+92")
+        assert parsed is not None
+        assert parsed.dep_versions is None