From 95976b69e4b9a0d1e7b2f0600ccd774b0e2ab803 Mon Sep 17 00:00:00 2001
From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>
Date: Wed, 10 Oct 2018 11:04:44 -0700
Subject: [PATCH] Use new Nox (#6175)

---
 .../google-cloud-redis/{nox.py => noxfile.py} | 31 +++----------------
 1 file changed, 5 insertions(+), 26 deletions(-)
 rename packages/google-cloud-redis/{nox.py => noxfile.py} (74%)

diff --git a/packages/google-cloud-redis/nox.py b/packages/google-cloud-redis/noxfile.py
similarity index 74%
rename from packages/google-cloud-redis/nox.py
rename to packages/google-cloud-redis/noxfile.py
index 964788384a5c..c0a19036996f 100644
--- a/packages/google-cloud-redis/nox.py
+++ b/packages/google-cloud-redis/noxfile.py
@@ -25,14 +25,8 @@
 )
 
 
-@nox.session
 def default(session):
     """Default unit test session.
-
-    This is intended to be run **without** an interpreter set, so
-    that the current ``python`` (on the ``PATH``) or the version of
-    Python corresponding to the ``nox`` binary the ``PATH`` can
-    run the tests.
     """
     # Install all test dependencies, then install local packages in-place.
     session.install('mock', 'pytest', 'pytest-cov')
@@ -56,54 +50,39 @@ def default(session):
     )
 
 
-@nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
-def unit(session, py):
+@nox.session(python=['2.7', '3.5', '3.6', '3.7'])
+def unit(session):
     """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
-
     default(session)
 
 
-@nox.session
+@nox.session(python='3.6')
 def lint(session):
     """Run linters.
 
     Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
-    session.interpreter = 'python3.6'
     session.install('flake8', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google', 'tests')
 
 
-@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'
-
-    # Set the virtualenv directory name.
-    session.virtualenv_dirname = 'setup'
-
     session.install('docutils', 'pygments')
     session.run('python', 'setup.py', 'check', '--restructuredtext',
                 '--strict')
 
 
-@nox.session
+@nox.session(python='3.6')
 def cover(session):
     """Run the final coverage report.
 
     This outputs the coverage report aggregating coverage from the unit
     test runs (not system test runs), and then erases coverage data.
     """
-    session.interpreter = 'python3.6'
     session.install('coverage', 'pytest-cov')
     session.run('coverage', 'report', '--show-missing', '--fail-under=100')
     session.run('coverage', 'erase')