Allow specifying the tag in publish_oci_artifact

src/eq/devtools/cli/__init__.py

@@ -1,8 +1,8 @@
 import click
 
 from .. import __version__
-from ._conda import conda
 from ._test import test
+from .conda import conda
 from .github import github
 
 

src/eq/devtools/cli/conda/__init__.py

@@ -0,0 +1 @@
+from ._conda import conda

src/eq/devtools/cli/_conda.py → src/eq/devtools/cli/conda/_conda.py

@@ -17,7 +17,7 @@ def conda():
     pass
 
 
-@conda.command()
+@conda.command(name="render")
 @click.option(
     "--version",
     type=str,
@@ -62,7 +62,7 @@ def render(
     )
 
 
-@conda.command()
+@conda.command(name="build")
 @click.option(
     "--recipe-file",
     type=Optional[str],
@@ -98,7 +98,7 @@ def build(
     )
 
 
-@conda.command()
+@conda.command(name="publish")
 @click.option(
     "--filepath", type=str, help="The filepath to the `.conda` package to publish."
 )
@@ -107,11 +107,18 @@ def build(
     type=str,
     help="The GitHub user or organisation to publish the package to.",
 )
+@click.option(
+    "--tag",
+    type=str,
+    default=None,
+    help="An optional tag to use instead of the package version.",
+)
 @click.option(
     "-v",
     "--verbose",
     is_flag=True,
     default=False,
+    help="A flag to enable verbose output for the `powerloader` command.",
 )
 @click.option(
     "--token",
@@ -130,6 +137,7 @@ def build(
 def publish(
     filepath,
     owner,
+    tag,
     verbose,
     token,
     debug,
@@ -138,6 +146,7 @@ def publish(
     publish_oci_artifact(
         filepath=filepath,
         owner=owner,
+        tag=tag,
         verbose=verbose,
         token=token,
         debug=debug,

src/eq/devtools/conda/_publish_oci.py

@@ -12,6 +12,7 @@ def publish_oci_artifact(
     filepath: str | Path,
     *,
     owner: str,
+    tag: str | None = None,
     verbose: bool = False,
     token: str | None = None,
     debug: bool = False,
@@ -37,8 +38,9 @@ def publish_oci_artifact(
     cmd = ["powerloader upload"]
     if verbose:
         cmd += ["-v"]
+    tag = tag or version.replace("+", "-")
     cmd += [
-        f"{filepath}:conda/{filename}:{version.replace('+', '-')}",
+        f"{filepath}:conda/{filename}:{tag}",
         "-m oci://ghcr.io",
     ]
     cmd = " ".join(cmd)