Merge pull request GoogleCloudPlatform#35 from GoogleCloudPlatform/pytest-refactor-noxify

Jon Wayne Parrott · Jon Wayne Parrott · commit f8970fd9daa4 · 2016-03-04T10:03:30.000-08:00
Adding a global nox lint session.
diff --git a/.travis.yml b/.travis.yml
@@ -9,19 +9,4 @@ before_install:
 install:
 - pip install nox-automation tox
 script:
-- nox --session reqcheck
-- cd $TRAVIS_BUILD_DIR/1-hello-world && tox
-- cp $TRAVIS_BUILD_DIR/config.py $TRAVIS_BUILD_DIR/2-structured-data && cd $TRAVIS_BUILD_DIR/2-structured-data
-  && tox -e lint
-- cp $TRAVIS_BUILD_DIR/config.py $TRAVIS_BUILD_DIR/3-binary-data && cd $TRAVIS_BUILD_DIR/3-binary-data
-  && tox -e lint
-- cp $TRAVIS_BUILD_DIR/config.py $TRAVIS_BUILD_DIR/4-auth && cd $TRAVIS_BUILD_DIR/4-auth
-  && tox -e lint
-- cp $TRAVIS_BUILD_DIR/config.py $TRAVIS_BUILD_DIR/5-logging && cd $TRAVIS_BUILD_DIR/5-logging
-  && tox -e lint
-- cp $TRAVIS_BUILD_DIR/config.py $TRAVIS_BUILD_DIR/6-pubsub && cd $TRAVIS_BUILD_DIR/6-pubsub
-  && tox -e lint
-- cp $TRAVIS_BUILD_DIR/config.py $TRAVIS_BUILD_DIR/7-gce && cd $TRAVIS_BUILD_DIR/7-gce
-  && tox -e lint
-after_script:
-- kill $DATASTORE_EMULATOR
+- nox --session reqcheck lint
diff --git a/nox.py b/nox.py
@@ -7,12 +7,17 @@
 def session_reqcheck(session):
     session.install(REPO_TOOLS_REQ)
 
-    for reqfile in glob('**/requirements.txt'):
-        session.run('gcprepotools', 'check-requirements', reqfile)
+    if 'update' in session.posargs:
+        command = 'update-requirements'
+    else:
+        command = 'check-requirements'
 
+    for reqfile in glob('**/requirements.txt'):
+        session.run('gcprepotools', command, reqfile)
 
-def session_requpdate(session):
-    session.install(REPO_TOOLS_REQ)
 
-    for reqfile in glob('**/requirements.txt'):
-        session.run('gcprepotools', 'update-requirements', reqfile)
+def session_lint(session):
+    session.install('flake8', 'flake8-import-order')
+    session.run(
+        'flake8', '--exclude=env,.nox,._config.py',
+        '--import-order-style=google', '.')
