Moving reqcheck/update into nox. Updating requirements.

Jon Wayne Parrott · Jon Wayne Parrott · commit e0ebd5b88bf5 · 2016-03-03T12:54:15.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
 .coverage.*
 .cache
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,9 @@ env:
 before_install:
 - openssl aes-256-cbc -K $encrypted_b4c8e1c51f6e_key -iv $encrypted_b4c8e1c51f6e_iv -in secrets.tar.enc -out secrets.tar -d
 - tar xvf secrets.tar
-- pip install tox
+- pip install nox-automation tox
 script:
-- tox
+- 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
diff --git a/2-structured-data/requirements.txt b/2-structured-data/requirements.txt
@@ -1,9 +1,9 @@
 Flask==0.10.1
 gcloud==0.10.1
 gunicorn==19.4.5
-oauth2client==2.0.0.post1
+oauth2client==2.0.1
 Flask-SQLAlchemy==2.1
 PyMySQL==0.7.2
-Flask-PyMongo==0.4.0
+Flask-PyMongo==0.4.1
 PyMongo==3.2.1
 six==1.10.0
diff --git a/3-binary-data/requirements.txt b/3-binary-data/requirements.txt
@@ -1,9 +1,9 @@
 Flask==0.10.1
 gcloud==0.10.1
 gunicorn==19.4.5
-oauth2client==2.0.0.post1
+oauth2client==2.0.1
 Flask-SQLAlchemy==2.1
 PyMySQL==0.7.2
-Flask-PyMongo==0.4.0
+Flask-PyMongo==0.4.1
 PyMongo==3.2.1
 six==1.10.0
diff --git a/4-auth/requirements.txt b/4-auth/requirements.txt
@@ -1,9 +1,9 @@
 Flask==0.10.1
 gcloud==0.10.1
 gunicorn==19.4.5
-oauth2client==2.0.0.post1
+oauth2client==2.0.1
 Flask-SQLAlchemy==2.1
 PyMySQL==0.7.2
-Flask-PyMongo==0.4.0
+Flask-PyMongo==0.4.1
 PyMongo==3.2.1
 six==1.10.0
diff --git a/5-logging/bookshelf/__init__.py b/5-logging/bookshelf/__init__.py
@@ -17,7 +17,7 @@
 
 from flask import current_app, Flask, redirect, request, session, url_for
 import httplib2
-from oauth2client.flask_util import UserOAuth2
+from oauth2client.contrib.flask_util import UserOAuth2
 
 
 oauth2 = UserOAuth2()
diff --git a/5-logging/requirements.txt b/5-logging/requirements.txt
@@ -1,9 +1,9 @@
 Flask==0.10.1
-gcloud==0.9.0
+gcloud==0.10.1
 gunicorn==19.4.5
-oauth2client==1.5.2
+oauth2client==2.0.1
 Flask-SQLAlchemy==2.1
-PyMySQL==0.7.1
-Flask-PyMongo==0.4.0
+PyMySQL==0.7.2
+Flask-PyMongo==0.4.1
 PyMongo==3.2.1
 six==1.10.0
diff --git a/6-pubsub/bookshelf/__init__.py b/6-pubsub/bookshelf/__init__.py
@@ -17,7 +17,7 @@
 
 from flask import current_app, Flask, redirect, request, session, url_for
 import httplib2
-from oauth2client.flask_util import UserOAuth2
+from oauth2client.contrib.flask_util import UserOAuth2
 
 
 oauth2 = UserOAuth2()
diff --git a/6-pubsub/requirements.txt b/6-pubsub/requirements.txt
@@ -1,10 +1,10 @@
 Flask==0.10.1
-gcloud==0.9.0
+gcloud==0.10.1
 gunicorn==19.4.5
-oauth2client==1.5.2
+oauth2client==2.0.1
 Flask-SQLAlchemy==2.1
-PyMySQL==0.7.1
-Flask-PyMongo==0.4.0
+PyMySQL==0.7.2
+Flask-PyMongo==0.4.1
 PyMongo==3.2.1
 six==1.10.0
 requests[security]==2.9.1
diff --git a/7-gce/bookshelf/__init__.py b/7-gce/bookshelf/__init__.py
@@ -17,7 +17,7 @@
 
 from flask import current_app, Flask, redirect, request, session, url_for
 import httplib2
-from oauth2client.flask_util import UserOAuth2
+from oauth2client.contrib.flask_util import UserOAuth2
 
 
 oauth2 = UserOAuth2()
diff --git a/7-gce/requirements.txt b/7-gce/requirements.txt
@@ -1,10 +1,10 @@
 Flask==0.10.1
-gcloud==0.9.0
+gcloud==0.10.1
 gunicorn==19.4.5
-oauth2client==1.5.2
+oauth2client==2.0.1
 Flask-SQLAlchemy==2.1
-PyMySQL==0.7.1
-Flask-PyMongo==0.4.0
+PyMySQL==0.7.2
+Flask-PyMongo==0.4.1
 PyMongo==3.2.1
 six==1.10.0
 requests[security]==2.9.1
diff --git a/nox.py b/nox.py
@@ -0,0 +1,18 @@
+from glob import glob
+
+REPO_TOOLS_REQ =\
+    'git+https://github.com/GoogleCloudPlatform/python-repo-tools.git'
+
+
+def session_reqcheck(session):
+    session.install(REPO_TOOLS_REQ)
+
+    for reqfile in glob('**/requirements.txt'):
+        session.run('gcprepotools', 'check-requirements', reqfile)
+
+
+def session_requpdate(session):
+    session.install(REPO_TOOLS_REQ)
+
+    for reqfile in glob('**/requirements.txt'):
+        session.run('gcprepotools', 'update-requirements', reqfile)
diff --git a/optional-container-engine/bookshelf/__init__.py b/optional-container-engine/bookshelf/__init__.py
@@ -17,7 +17,7 @@
 
 from flask import current_app, Flask, redirect, request, session, url_for
 import httplib2
-from oauth2client.flask_util import UserOAuth2
+from oauth2client.contrib.flask_util import UserOAuth2
 
 
 oauth2 = UserOAuth2()
diff --git a/optional-container-engine/requirements.txt b/optional-container-engine/requirements.txt
@@ -1,10 +1,10 @@
 Flask==0.10.1
-gcloud==0.9.0
+gcloud==0.10.1
 gunicorn==19.4.5
-oauth2client==1.5.2
+oauth2client==2.0.1
 Flask-SQLAlchemy==2.1
-PyMySQL==0.7.1
-Flask-PyMongo==0.4.0
+PyMySQL==0.7.2
+Flask-PyMongo==0.4.1
 PyMongo==3.2.1
 six==1.10.0
 requests[security]==2.9.1
diff --git a/scripts/README.md b/scripts/README.md
diff --git a/scripts/check_requirements.py b/scripts/check_requirements.py
diff --git a/scripts/update_requirements.py b/scripts/update_requirements.py
diff --git a/tox.ini b/tox.ini
