establish standard leading __ for virtual packages

ScottEvtuch · May 30, 2019 · 90c6ed2 · 90c6ed2
1 parent 148cfb0
commit 90c6ed2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/conda/core/index.py b/conda/core/index.py
@@ -143,7 +143,7 @@ def _supplement_index_with_features(index, features=()):
 def _supplement_index_with_system(index):
     cuda_version = context.cuda_version
     if cuda_version is not None:
-        rec = _make_virtual_package('_cuda', cuda_version)
+        rec = _make_virtual_package('__cuda', cuda_version)
         index[rec.name] = rec
 
 

diff --git a/docs/source/user-guide/tasks/manage-virtual.rst b/docs/source/user-guide/tasks/manage-virtual.rst
@@ -13,9 +13,10 @@ real packages and not displayed by ``conda list``.  Instead ``conda`` runs a
 small bit of code to detect the presence or absence of the system feature that
 corresponds to the package.  The currently supported list of virtual packages includes:
 
-  * ``_cuda``: Maximum version of CUDA supported by the display driver
+  * ``__cuda``: Maximum version of CUDA supported by the display driver
 
-Other virtual packages will be added in future conda releases.
+Other virtual packages will be added in future conda releases.  These are denoted
+by a leading double-underscore in the package name.
 
 
 Listing detected virtual packages
@@ -40,7 +41,7 @@ section, as shown in this example::
               conda version : 4.6.3.post8+8f640d35a
         conda-build version : 3.17.8
              python version : 3.7.2.final.0
-           virtual packages : _cuda=10.0
+           virtual packages : __cuda=10.0
            base environment : /Users/demo/dev/conda/devenv  (writable)
                channel URLs : https://repo.anaconda.com/pkgs/main/osx-64
                               https://repo.anaconda.com/pkgs/main/noarch

diff --git a/tests/core/test_index.py b/tests/core/test_index.py
@@ -49,7 +49,7 @@ def test_supplement_index_with_system():
     with env_vars({'CONDA_OVERRIDE_CUDA': '3.2'}):
         _supplement_index_with_system(index)
 
-    cuda_pkg = index['_cuda']
+    cuda_pkg = index['__cuda']
     assert cuda_pkg.version == '3.2'
     assert cuda_pkg.package_type == PackageType.VIRTUAL_SYSTEM
 

diff --git a/tests/data/index.json b/tests/data/index.json
@@ -21209,7 +21209,7 @@
     "build": "0",
     "build_number": 0,
     "depends": [
-      "_cuda>=9.0"
+      "__cuda>=9.0"
     ],
     "md5": "28a63f84034658e80779e88e70fad7bf",
     "name": "cudatoolkit",
@@ -21220,7 +21220,7 @@
     "build": "0",
     "build_number": 0,
     "depends": [
-      "_cuda>=10.0"
+      "__cuda>=10.0"
     ],
     "md5": "28a63f84034658e80779e88e70fad7bf",
     "name": "cudatoolkit",