Updating all requirements and adding req check and update scripts.

Jon Wayne Parrott · Jon Wayne Parrott · commit 6c61c5cc5dc0 · 2016-01-21T13:54:10.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ before_install:
 - tar xvf secrets.tar
 - pip install tox
 script:
+- tox
 - 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/1-hello-world/app.yaml b/1-hello-world/app.yaml
@@ -18,7 +18,6 @@
 # [START runtime]
 runtime: custom
 vm: true
-entrypoint: custom
 # [END runtime]
 
 # Temporary setting to keep gcloud from uploading the virtualenv
diff --git a/1-hello-world/requirements.txt b/1-hello-world/requirements.txt
@@ -1,2 +1,2 @@
 Flask==0.10.1
-gunicorn==19.3.0
+gunicorn==19.4.5
diff --git a/2-structured-data/requirements.txt b/2-structured-data/requirements.txt
@@ -1,9 +1,9 @@
 Flask==0.10.1
-gcloud==0.7.1
-gunicorn==19.3.0
-oauth2client==1.5.0
-Flask-SQLAlchemy==2.0
-PyMySQL==0.6.6
-Flask-PyMongo==0.3.1
-PyMongo==2.8.1
-six==1.9.0
+gcloud==0.8.0
+gunicorn==19.4.5
+oauth2client==1.5.2
+Flask-SQLAlchemy==2.1
+PyMySQL==0.7.1
+Flask-PyMongo==0.4.0
+PyMongo==3.2
+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.7.1
-gunicorn==19.3.0
-oauth2client==1.5.0
-Flask-SQLAlchemy==2.0
-PyMySQL==0.6.6
-Flask-PyMongo==0.3.1
-PyMongo==2.8.1
-six==1.9.0
+gcloud==0.8.0
+gunicorn==19.4.5
+oauth2client==1.5.2
+Flask-SQLAlchemy==2.1
+PyMySQL==0.7.1
+Flask-PyMongo==0.4.0
+PyMongo==3.2
+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.7.1
-gunicorn==19.3.0
-oauth2client==1.5.0
-Flask-SQLAlchemy==2.0
-PyMySQL==0.6.6
-Flask-PyMongo==0.3.1
-PyMongo==2.8.1
-six==1.9.0
+gcloud==0.8.0
+gunicorn==19.4.5
+oauth2client==1.5.2
+Flask-SQLAlchemy==2.1
+PyMySQL==0.7.1
+Flask-PyMongo==0.4.0
+PyMongo==3.2
+six==1.10.0
diff --git a/5-logging/requirements.txt b/5-logging/requirements.txt
@@ -1,9 +1,9 @@
 Flask==0.10.1
-gcloud==0.7.1
-gunicorn==19.3.0
-oauth2client==1.5.0
-Flask-SQLAlchemy==2.0
-PyMySQL==0.6.6
-Flask-PyMongo==0.3.1
-PyMongo==2.8.1
-six==1.9.0
+gcloud==0.8.0
+gunicorn==19.4.5
+oauth2client==1.5.2
+Flask-SQLAlchemy==2.1
+PyMySQL==0.7.1
+Flask-PyMongo==0.4.0
+PyMongo==3.2
+six==1.10.0
diff --git a/6-pubsub/requirements.txt b/6-pubsub/requirements.txt
@@ -1,12 +1,12 @@
 Flask==0.10.1
-gcloud==0.7.1
-gunicorn==19.3.0
-oauth2client==1.5.0
-Flask-SQLAlchemy==2.0
-PyMySQL==0.6.6
-Flask-PyMongo==0.3.1
-PyMongo==2.8.1
-six==1.9.0
-requests[security]==2.7.0
+gcloud==0.8.0
+gunicorn==19.4.5
+oauth2client==1.5.2
+Flask-SQLAlchemy==2.1
+PyMySQL==0.7.1
+Flask-PyMongo==0.4.0
+PyMongo==3.2
+six==1.10.0
+requests[security]==2.9.1
 honcho==0.6.6
-psq==0.1.0
+psq==0.2.1
diff --git a/7-gce/requirements.txt b/7-gce/requirements.txt
@@ -1,12 +1,12 @@
 Flask==0.10.1
-gcloud==0.7.1
-gunicorn==19.3.0
-oauth2client==1.5.0
-Flask-SQLAlchemy==2.0
-PyMySQL==0.6.6
-Flask-PyMongo==0.3.1
-PyMongo==2.8.1
-six==1.9.0
-requests[security]==2.7.0
+gcloud==0.8.0
+gunicorn==19.4.5
+oauth2client==1.5.2
+Flask-SQLAlchemy==2.1
+PyMySQL==0.7.1
+Flask-PyMongo==0.4.0
+PyMongo==3.2
+six==1.10.0
+requests[security]==2.9.1
 honcho==0.6.6
-psq==0.1.0
+psq==0.2.1
diff --git a/optional-container-engine/requirements.txt b/optional-container-engine/requirements.txt
@@ -1,12 +1,12 @@
 Flask==0.10.1
-gcloud==0.7.1
-gunicorn==19.3.0
-oauth2client==1.5.0
-Flask-SQLAlchemy==2.0
-PyMySQL==0.6.6
-Flask-PyMongo==0.3.1
-PyMongo==2.8.1
-six==1.9.0
-requests[security]==2.7.0
+gcloud==0.8.0
+gunicorn==19.4.5
+oauth2client==1.5.2
+Flask-SQLAlchemy==2.1
+PyMySQL==0.7.1
+Flask-PyMongo==0.4.0
+PyMongo==3.2
+six==1.10.0
+requests[security]==2.9.1
 honcho==0.6.6
-psq==0.1.0
+psq==0.2.1
diff --git a/scripts/README.md b/scripts/README.md
@@ -0,0 +1 @@
+These scripts are used for the maintenance of this repository and are not necessarily meant as samples.
diff --git a/scripts/check_requirements.py b/scripts/check_requirements.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2013 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Checks dependencies in requirements.txt to ensure they are the latest version.
+"""
+
+import argparse
+import sys
+
+from update_requirements import get_package_info, read_requirements
+
+
+def check_req(req):
+    info = get_package_info(req.project_name)
+    newest_version = info['version']
+    current_spec = req.specs[0] if req.specs else ('==', 'unspecified')
+    if current_spec[1] != newest_version:
+        return req, newest_version
+
+
+def main(req_file):
+    reqs = read_requirements(req_file)
+    outdated_reqs = filter(None, [check_req(req) for req in reqs])
+
+    if outdated_reqs:
+        for req in outdated_reqs:
+            print("{} is out of date, latest version is {}".format(*req))
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument(
+        'requirements_file',
+        help='Path the the requirements.txt file to check.')
+
+    args = parser.parse_args()
+
+    main(args.requirements_file)
diff --git a/scripts/update_requirements.py b/scripts/update_requirements.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2013 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Updates dependencies in requirements.txt to the latest version.
+"""
+
+import argparse
+
+from pip.req.req_file import parse_requirements
+from pkg_resources import Requirement
+import requests
+
+
+def get_package_info(package):
+    url = 'https://pypi.python.org/pypi/{}/json'.format(package)
+    r = requests.get(url)
+    r.raise_for_status()
+    return r.json()['info']
+
+
+def read_requirements(req_file):
+    return [x.req for x in parse_requirements(req_file, session={})]
+
+
+def update_req(req):
+    info = get_package_info(req.project_name)
+    newest_version = info['version']
+    current_spec = req.specs[0] if req.specs else ('==', 'unspecified')
+    new_spec = ('==', newest_version)
+    if current_spec != new_spec:
+        newreq = Requirement(req.unsafe_name, [new_spec], req.extras)
+        print('Updated {} from {} -> {}'.format(
+            req.project_name,
+            current_spec[1],
+            newest_version))
+        return newreq
+    return req
+
+
+def write_requirements(reqs, req_file):
+    with open(req_file, 'w') as f:
+        for req in reqs:
+            f.write('{}\n'.format(req))
+
+
+def main(req_file):
+    reqs = read_requirements(req_file)
+    reqs = [update_req(req) for req in reqs]
+    write_requirements(reqs, req_file)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument(
+        'requirements_file',
+        help='Path the the requirements.txt file to update.')
+
+    args = parser.parse_args()
+
+    main(args.requirements_file)
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,23 @@
+[tox]
+skipsdist = True
+envlist = reqcheck
+
+[testenv:reqcheck]
+deps =
+    requests[security]
+commands =
+    bash -c "find . -name requirements.txt |\
+        xargs -n 1 ./scripts/check_requirements.py"
+whitelist_externals =
+    bash
+    xargs
+
+[testenv:requpdate]
+deps =
+    requests[security]
+commands =
+    bash -c "find . -name requirements.txt |\
+        xargs -n 1 ./scripts/update_requirements.py"
+whitelist_externals =
+    bash
+    xargs

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Flask==0.10.1`
`2`		`-gunicorn==19.3.0`
	`2`	`+gunicorn==19.4.5`