update requirements

Change-Id: Idac1ff9ba02e48b7b86a2f6a12ad86cb244f2d3c

requirements.txt

@@ -1,24 +1,24 @@
-Babel>=1.3
-eventlet>=0.17.4
-greenlet>=0.3.2
-oslo.concurrency>=2.3.0         # Apache-2.0
-oslo.config>=2.3.0  # Apache-2.0
-oslo.log>=1.8.0  # Apache-2.0
-oslo.utils>=2.0.0                       # Apache-2.0
-oslo.serialization>=1.4.0  # Apache-2.0
-oslo.db>=2.4.1  # Apache-2.0
-paramiko>=1.13.0
-Paste
-PasteDeploy>=1.5.0
-pbr<2.0,>=1.6
-python-cinderclient>=1.3.1
-python-glanceclient>=0.18.0
-python-keystoneclient>=1.6.0
-python-neutronclient<3,>=2.6.0
-python-novaclient>=2.26.0
-Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7'
-Routes>=1.12.3,!=2.0;python_version!='2.7'
-six>=1.9.0
-SQLAlchemy<1.1.0,>=0.9.9
-sqlalchemy-migrate>=0.9.6
-WebOb>=1.2.3
+Babel>=1.3,!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3  # BSD
+eventlet!=0.18.3,>=0.18.2  # MIT
+greenlet>=0.3.2  # MIT
+oslo.concurrency>=3.5.0         # Apache-2.0
+oslo.config>=3.9.0  # Apache-2.0
+oslo.log>=1.14.0  # Apache-2.0
+oslo.utils>=3.5.0                       # Apache-2.0
+oslo.serialization>=1.10.0              # Apache-2.0
+oslo.db>=4.1.0  # Apache-2.0
+paramiko>=1.16.0  # LGPL
+Paste  # MIT
+PasteDeploy>=1.5.0  # MIT
+pbr>=1.6  # Apache-2.0
+python-cinderclient>=1.6.0  # Apache-2.0
+python-glanceclient>=2.0.0  # Apache-2.0
+python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0  # Apache-2.0
+python-neutronclient>=4.2.0  # Apache-2.0
+python-novaclient>=2.29.0,!=2.33.0  # Apache-2.0
+Routes>=1.12.3,!=2.0,!=2.1,!=2.3.0;python_version=='2.7'  # MIT
+Routes>=1.12.3,!=2.0,!=2.3.0;python_version!='2.7'  # MIT
+six>=1.9.0  # MIT
+SQLAlchemy>=1.0.10,<1.1.0  # MIT
+sqlalchemy-migrate>=0.9.6  # Apache-2.0
+WebOb>=1.2.3  # MIT

test-requirements.txt

@@ -1,14 +1,13 @@
-coverage>=3.6
-discover
-feedparser
-fixtures>=0.3.14
-hacking<0.11,>=0.10.2
-mox>=0.5.3
-mock>=1.0
-oslo.sphinx
-oslotest>=1.10.0 # Apache-2.0
-pylint==0.25.2
-python-subunit>=0.0.18
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testrepository>=0.0.18
-testtools>=0.9.34
+coverage>=3.6  # Apache-2.0
+discover  # BSD
+feedparser  # BSD
+fixtures>=1.3.1,<2.0  # Apache-2.0/BSD
+hacking>=0.10.2,<0.11  # Apache-2.0
+mox>=0.5.3  # Apache-2.0
+mock>=1.2  # BSD
+oslotest>=1.10.0  # Apache-2.0
+pylint==1.4.5  # GNU GPL v2
+python-subunit>=0.0.18  # Apache-2.0/BSD
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3  # BSD
+testrepository>=0.0.18  # Apache-2.0/BSD
+testtools>=1.4.0  # MIT

tools/update-from-global-requirements.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+# Copyright (c) 2016 OpenStack Foundation
+# All Rights Reserved.
+#
+#    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.
+
+GLOBAL_REQS_PATH=${1:-$HOME/openstack/requirements/global-requirements.txt}
+
+function update() {
+  rm -f temp-requirements.txt
+  touch temp-requirements.txt
+  while read line ; do
+    local module=`echo $line | sed 's/\([.A-Za-z0-9\-]*\)[ ><!=\t]*.*/\1/'`
+    local newm=`grep -e "^$module[ ><!=\t]" $GLOBAL_REQS_PATH`
+    if ! grep "$newm" temp-requirements.txt >/dev/null ; then
+      echo "$newm" >> temp-requirements.txt
+    fi
+  done < $1
+  mv temp-requirements.txt $1
+}
+
+echo "Update requirements"
+update requirements.txt
+echo "Update test-requirements"
+update test-requirements.txt