Unify error and warning messages, use a URL

conda-incubator · Nov 22, 2023 · a566e7d · a566e7d
1 parent a560d1f
commit a566e7d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/conda-store-server/conda_store_server/action/generate_conda_docker.py b/conda-store-server/conda_store_server/action/generate_conda_docker.py
@@ -12,9 +12,10 @@ def action_generate_conda_docker(
     output_image_name: str,
     output_image_tag: str,
 ):
-    # Upstream issue in conda-docker, see
-    # https://github.com/conda-incubator/conda-store/issues/666
-    raise RuntimeError("Generating Docker images is currently not supported, see #666")
+    raise RuntimeError(
+        "Generating Docker images is currently not supported, see "
+        "https://github.com/conda-incubator/conda-store/issues/666"
+    )
 
     # Import is inside the function because conda_docker is only available on
     # Linux

diff --git a/conda-store-server/conda_store_server/build.py b/conda-store-server/conda_store_server/build.py
@@ -313,11 +313,12 @@ def build_conda_pack(db: Session, conda_store, build: orm.Build):
 
 
 def build_conda_docker(db: Session, conda_store, build: orm.Build):
-    # Upstream issue in conda-docker, see
-    # https://github.com/conda-incubator/conda-store/issues/666
     import warnings
 
-    warnings.warn("Generating Docker images is currently not supported, see #666")
+    warnings.warn(
+        "Generating Docker images is currently not supported, see "
+        "https://github.com/conda-incubator/conda-store/issues/666"
+    )
     return
 
     conda_prefix = build.build_path(conda_store)

diff --git a/conda-store-server/tests/test_actions.py b/conda-store-server/tests/test_actions.py
@@ -129,7 +129,7 @@ def test_generate_conda_pack(tmp_path, conda_prefix):
 
 
 @pytest.mark.xfail(reason=(
-    "upstream issue in conda-docker, see "
+    "Generating Docker images is currently not supported, see "
     "https://github.com/conda-incubator/conda-store/issues/666"))
 def test_generate_conda_docker(conda_store, conda_prefix):
     action.action_generate_conda_docker(