address review

datadog_checks_dev/datadog_checks/dev/tooling/commands/env/start.py

@@ -32,8 +32,7 @@
     '--python',
     '-py',
     type=click.INT,
-    default=DEFAULT_PYTHON_VERSION,
-    help='The version of Python to use (default {})'.format(DEFAULT_PYTHON_VERSION),
+    help='The version of Python to use. Defaults to {} if no tox Python is specified.'.format(DEFAULT_PYTHON_VERSION),
 )
 @click.option('--dev/--prod', help='Whether to use the latest version of a check or what is shipped')
 @click.option('--base', is_flag=True, help='Whether to use the latest version of the base check or what is shipped')
@@ -73,7 +72,10 @@ def start(ctx, check, env, agent, python, dev, base, env_vars):
         abort()
 
     env_python_version = get_tox_env_python_version(env)
-    if env_python_version and env_python_version != str(python):
+    if not python:
+        # Make the tox environment Python specifier influence the Agent
+        python = env_python_version or DEFAULT_PYTHON_VERSION
+    elif env_python_version and env_python_version != str(python):
         echo_warning(
             'The local environment `{}` does not match the expected Python. The Agent will use Python {}. '
             'To influence the Agent Python version, use the `-py/--python` option.'.format(env, python)
@@ -128,7 +130,7 @@ def start(ctx, check, env, agent, python, dev, base, env_vars):
         stop_environment(check, env, metadata=metadata)
         abort()
 
-    env_vars = dict(ev.split('=') for ev in env_vars)
+    env_vars = dict(ev.split('=', 1) for ev in env_vars)
     for key, value in metadata.get('env_vars', {}):
         env_vars.setdefault(key, value)
 

datadog_checks_dev/datadog_checks/dev/tooling/commands/env/test.py

@@ -4,7 +4,7 @@
 import click
 
 from ...e2e.agent import DEFAULT_PYTHON_VERSION
-from ...testing import get_tox_env_python_version, get_tox_envs
+from ...testing import get_tox_envs
 from ..console import CONTEXT_SETTINGS, echo_info, echo_warning
 from ..test import test as test_command
 from .start import start
@@ -68,14 +68,6 @@ def test(ctx, checks, agent, python, dev, base, env_vars, new_env):
 
         for env in envs:
             if new_env:
-                if not python:
-                    # Make the tox environment Python specifier influence the Agent
-                    env_python_version = get_tox_env_python_version(env)
-                    if env_python_version:
-                        python = env_python_version
-                    else:
-                        python = DEFAULT_PYTHON_VERSION
-
                 ctx.invoke(
                     start, check=check, env=env, agent=agent, python=python, dev=dev, base=base, env_vars=env_vars
                 )

datadog_checks_dev/datadog_checks/dev/tooling/testing.py

@@ -223,4 +223,4 @@ def get_changed_checks():
 def get_tox_env_python_version(env):
     match = re.match(PYTHON_MAJOR_PATTERN, env)
     if match:
-        return match.group(1)
+        return int(match.group(1))