Use new Nox (#6175)

googleapis · Oct 10, 2018 · dfb5a7d · dfb5a7d
1 parent 0715c9e
commit dfb5a7d
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/packages/google-cloud-os-login/nox.py → packages/google-cloud-os-login/noxfile.py b/packages/google-cloud-os-login/nox.py → packages/google-cloud-os-login/noxfile.py
@@ -18,23 +18,7 @@
 import nox
 
 
-@nox.session
 def default(session):
-    return unit(session, 'default')
-
-
-@nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
-def unit(session, py):
-    """Run the unit test suite."""
-
-    # Run unit tests against all supported versions of Python.
-    if py != 'default':
-        session.interpreter = 'python{}'.format(py)
-
-    # Set the virtualenv directory name.
-    session.virtualenv_dirname = 'unit-' + py
-
     # Install all test dependencies, then install this package in-place.
     session.install('pytest')
     session.install('-e', '.')
@@ -43,10 +27,15 @@ def unit(session, py):
     session.run('py.test', '--quiet', os.path.join('tests', 'unit'))
 
 
-@nox.session
+@nox.session(python=['2.7', '3.5', '3.6', '3.7'])
+def unit(session):
+    """Run the unit test suite."""
+    default(session)
+
+
+@nox.session(python='3.6')
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
-    session.interpreter = 'python3.6'
     session.install('docutils', 'pygments')
     session.run('python', 'setup.py', 'check', '--restructuredtext',
                 '--strict')