Merge "Remove requirements_style_check"

requirements.txt

@@ -1,3 +1,4 @@
+pbr>=0.5.21,<1.0
 
 anyjson>=0.3.3
 argparse
@@ -10,14 +11,12 @@ iso8601>=0.1.8
 kombu>=2.4.8
 lxml>=2.3
 oslo.config>=1.2.0
-pbr>=0.5.21,<1.0
 pecan>=0.2.0
 posix_ipc
 python-heatclient>=0.2.3
 python-keystoneclient>=0.4.1
 python-novaclient>=2.15.0
 PyYAML>=3.1.0
-setuptools_git>=0.4
 six>=1.4.1
 SQLAlchemy>=0.7.8,<=0.7.99
 sqlalchemy-migrate>=0.8.2

tools/requirements_style_check.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# Enforce the requirement that dependencies are listed in the input
-# files in alphabetical order.
-
-# FIXME(dhellmann): This doesn't deal with URL requirements very
-# well. We should probably sort those on the egg-name, rather than the
-# full line.
-
-function check_file() {
-    typeset f=$1
-
-    # We don't care about comment lines.
-    grep -v '^#' $f > ${f}.unsorted
-    sort -i -f ${f}.unsorted > ${f}.sorted
-    diff -c ${f}.unsorted ${f}.sorted
-    rc=$?
-    rm -f ${f}.sorted ${f}.unsorted
-    return $rc
-}
-
-exit_code=0
-for filename in $@
-do
-    check_file $filename
-    if [ $? -ne 0 ]
-    then
-        echo "Please list requirements in $filename in alphabetical order" 1>&2
-        exit_code=1
-    fi
-done
-exit $exit_code

tox.ini

@@ -19,7 +19,6 @@ downloadcache = ~/cache/pip
 [testenv:pep8]
 commands =
   flake8
-  {toxinidir}/tools/requirements_style_check.sh requirements.txt test-requirements.txt
 
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}