Use new Nox (#6175)

packages/google-cloud-videointelligence/nox.py → packages/google-cloud-videointelligence/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,22 +27,21 @@ def unit(session, py):
     session.run('py.test', '--quiet', os.path.join('tests', 'unit'))
 
 
+@nox.session(python=['2.7', '3.5', '3.6', '3.7'])
+def unit(session):
+    """Run the unit test suite."""
+    default(session)
+
+
 # TODO: Fix generated system tests
-#@nox.session
-#@nox.parametrize('py', ['2.7', '3.7'])
-#def system(session, py):
+#@nox.session(python=['2.7', '3.7'])
+#def system(session):
 #    """Run the system test suite."""
 #
 #    # Sanity check: Only run system tests if the environment variable is set.
 #    if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
 #        session.skip('Credentials must be set via environment variable.')
 #
-#    # Run unit tests against all supported versions of Python.
-#    session.interpreter = 'python{}'.format(py)
-#
-#    # Set the virtualenv dirname.
-#    session.virtualenv_dirname = 'sys-' + py
-#
 #    # Install all test dependencies, then install this package in-place.
 #    session.install('pytest')
 #    session.install('-e', '.')
@@ -68,10 +51,9 @@ def unit(session, py):
 #                *session.posargs)
 
 
-@nox.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')