fix outdated conda run --help

Signed-off-by: Kale Franz <[email protected]>

conda/cli/conda_argparse.py

@@ -961,7 +961,7 @@ def configure_parser_run(sub_parsers):
     Example usage:
 
         $ conda create -y -n my-python-2-env python=2
-        $ conda run -n my-python-2-env python -- --version
+        $ conda run -n my-python-2-env python --version
     """)
 
     epilog = dedent("""

conda/models/records.py

@@ -335,7 +335,7 @@ def record_id(self):
         #          the official record_id / uid until it gets namespace.  Even then, we might
         #          make the format different.  Probably something like
         #              channel_name/subdir:namespace:name-version-build_number-build_string
-        return "%s/%s::%s-%s-%s" % (self.channel.canonical_name, self.subdir,
+        return "%s/%s::%s-%s-%s" % (self.channel.name, self.subdir,
                                     self.name, self.version, self.build)
 
 

tests/data/build-index2-json.py

@@ -1,18 +1,19 @@
 import json
-from os.path import dirname, join
+from os.path import abspath, dirname, join
 
 from conda.core.subdir_data import fetch_repodata_remote_request
 
+DATA_DIR = abspath(join(dirname(__file__), "..", "..", "test-data", "repodata"))
 
 def save_data_source(url, name):
     raw_repodata_str = fetch_repodata_remote_request(url, None, None)
     json.loads(raw_repodata_str)
-    with open(join(dirname(__file__), "repodata", name + ".json"), 'w') as fh:
+    with open(join(DATA_DIR, name + ".json"), 'w') as fh:
         json.dump(json.loads(raw_repodata_str), fh, indent=2, sort_keys=True, separators=(',', ': '))
 
 
 def read_data_source(name):
-    with open(join(dirname(__file__), "repodata", name + ".json")) as fh:
+    with open(join(DATA_DIR, name + ".json")) as fh:
         return json.load(fh)
 
 

tests/data/build-index4-json.py

@@ -1,20 +1,21 @@
 import json
-from os.path import dirname, join
+from os.path import abspath, dirname, join
 from pprint import pprint
 
-from conda.core.subdir_data import fetch_repodata_remote_request
 from conda.common.compat import itervalues
+from conda.core.subdir_data import fetch_repodata_remote_request
 
+DATA_DIR = abspath(join(dirname(__file__), "..", "..", "test-data", "repodata"))
 
 def save_data_source(url, name):
     raw_repodata_str = fetch_repodata_remote_request(url, None, None)
     json.loads(raw_repodata_str)
-    with open(join(dirname(__file__), "repodata", name + ".json"), 'w') as fh:
+    with open(join(DATA_DIR, name + ".json"), 'w') as fh:
         json.dump(json.loads(raw_repodata_str), fh, indent=2, sort_keys=True, separators=(',', ': '))
 
 
 def read_data_source(name):
-    with open(join(dirname(__file__), "repodata", name + ".json")) as fh:
+    with open(join(DATA_DIR, name + ".json")) as fh:
         return json.load(fh)
 
 

tests/data/build-index5-json.py

@@ -1,19 +1,20 @@
 import json
-from os.path import dirname, join
+from os.path import abspath, dirname, join
 from pprint import pprint
 
 from conda.core.subdir_data import fetch_repodata_remote_request
 
+DATA_DIR = abspath(join(dirname(__file__), "..", "..", "test-data", "repodata"))
 
 def save_data_source(url, name):
     raw_repodata_str = fetch_repodata_remote_request(url, None, None)
     json.loads(raw_repodata_str)
-    with open(join(dirname(__file__), "repodata", name + ".json"), 'w') as fh:
+    with open(join(DATA_DIR, name + ".json"), 'w') as fh:
         json.dump(json.loads(raw_repodata_str), fh, indent=2, sort_keys=True, separators=(',', ': '))
 
 
 def read_data_source(name):
-    with open(join(dirname(__file__), "repodata", name + ".json")) as fh:
+    with open(join(DATA_DIR, name + ".json")) as fh:
         return json.load(fh)