Do not yield osx virtual package when CONDA_OVERRIDE_OSX="" (conda#12715

) * Do not yield osx virtual package when CONDA_OVERRIDE_OSX="" * Add changelog * adding newline * Trigger CI --------- Co-authored-by: Travis Hathaway <[email protected]>
Taisho · May 30, 2023 · f83014e · f83014e
1 parent 2e48858
commit f83014e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/conda/plugins/virtual_packages/osx.py b/conda/plugins/virtual_packages/osx.py
@@ -15,4 +15,5 @@ def conda_virtual_packages():
 
     _, dist_version = context.os_distribution_name_version
     dist_version = os.environ.get("CONDA_OVERRIDE_OSX", dist_version)
-    yield CondaVirtualPackage("osx", dist_version, None)
+    if dist_version:
+        yield CondaVirtualPackage("osx", dist_version, None)
diff --git a/news/12715-osx-virtual-package b/news/12715-osx-virtual-package
@@ -0,0 +1,19 @@
+### Enhancements
+
+* <news item>
+
+### Bug fixes
+
+* Don't export `__osx` virtual package when `CONDA_OVERRIDE_OSX=""` (#12715)
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* <news item>
diff --git a/tests/plugins/test_virtual_packages.py b/tests/plugins/test_virtual_packages.py
@@ -141,3 +141,22 @@ def test_glibc_override():
             virtual = [p for p in packages if p.channel.name == "@"]
             libc_exported = any("libc" in p.name for p in virtual)
             assert libc_exported == bool(version)
+
+
+def test_osx_override():
+    """Conda should not produce a osx virtual package when CONDA_OVERRIDE_OSX=""."""
+    for version in "", "1.0":
+        with env_vars(
+            {"CONDA_SUBDIR": "osx-64", "CONDA_OVERRIDE_OSX": version},
+            stack_callback=conda_tests_ctxt_mgmt_def_pol,
+        ):
+            packages = conda.core.index.get_reduced_index(
+                context.default_prefix,
+                context.default_channels,
+                context.subdirs,
+                (),
+                context.repodata_fns[0],
+            )
+            virtual = [p for p in packages if p.channel.name == "@"]
+            osx_exported = any("osx" in p.name for p in virtual)
+            assert osx_exported == bool(version)