Rename new option from --kernel-name to --nbval-kernel-name.

Author: ceball

nbval/plugin.py

@@ -89,9 +89,9 @@ def pytest_addoption(parser):
                          'the same environment that py.test was '
                          'launched from. Without this flag, the kernel stored '
                          'in the notebook is used by default. '
-                         'See also: --kernel-name')
+                         'See also: --nbval-kernel-name')
 
-    group.addoption('--kernel-name', action='store', default=None,
+    group.addoption('--nbval-kernel-name', action='store', default=None,
                     help='Force test execution to use the named kernel. '
                          'If a kernel is not named, the kernel stored in the '
                          'notebook is used by default. '
@@ -113,8 +113,8 @@ def pytest_configure(config):
         reporter = NbdimeReporter(config, sys.stdout)
         config.pluginmanager.register(reporter, 'nbdimereporter')
     if config.option.nbval or config.option.nbval_lax:
-        if config.option.kernel_name and config.option.current_env:
-            raise ValueError("--current-env and --kernel-name are mutually exclusive.")
+        if config.option.nbval_kernel_name and config.option.current_env:
+            raise ValueError("--current-env and --nbval-kernel-name are mutually exclusive.")
 
 
 
@@ -236,12 +236,12 @@ def setup(self):
         Called by pytest to setup the collector cells in .
         Here we start a kernel and setup the sanitize patterns.
         """
-        # we've already checked that --current-env and --kernel-name
-        # were not both supplied
+        # we've already checked that --current-env and
+        # --nbval-kernel-name were not both supplied
         if self.parent.config.option.current_env:
             kernel_name = CURRENT_ENV_KERNEL_NAME
-        elif self.parent.config.option.kernel_name:
-            kernel_name = self.parent.config.option.kernel_name
+        elif self.parent.config.option.nbval_kernel_name:
+            kernel_name = self.parent.config.option.nbval_kernel_name
         else:
             kernel_name = self.nb.metadata.get(
                 'kernelspec', {}).get('name', 'python')