From f75b795b98417765376a55078f090f6c5d203430 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-asset/{nox.py => noxfile.py} | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) rename packages/google-cloud-asset/{nox.py => noxfile.py} (74%) diff --git a/packages/google-cloud-asset/nox.py b/packages/google-cloud-asset/noxfile.py similarity index 74% rename from packages/google-cloud-asset/nox.py rename to packages/google-cloud-asset/noxfile.py index 884edf60d671..a3ed016336e6 100644 --- a/packages/google-cloud-asset/nox.py +++ b/packages/google-cloud-asset/noxfile.py @@ -19,24 +19,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', '.') @@ -45,10 +28,14 @@ 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')