Revert: requirement files in alphabetical order

This manually reverts commit 07827ed717
which sorted the requirement files in alphabetical order and added a
test to ensure that they were sorted.

The requirement files should not be sorted:
http://lists.openstack.org/pipermail/openstack-dev/2014-September/044736.html

Change-Id: I8917b85ad1d8571dc36ecda7570ee53c4e5da72d

requirements.txt

@@ -1,6 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
+pbr<2.0,>=0.11
 anyjson>=0.3.3
 appdirs>=1.3.0 # MIT License
 dogpile.cache>=0.5.3
@@ -8,7 +9,6 @@ httplib2>=0.7.5
 lxml>=2.3
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.utils>=1.6.0 # Apache-2.0
-pbr<2.0,>=0.11
 PrettyTable<0.8,>=0.7
 python-keystoneclient>=1.6.0
 six>=1.9.0

test-requirements.txt

@@ -1,14 +1,14 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-Babel>=1.3
+hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 fixtures>=1.3.1
-hacking<0.11,>=0.10.0
 httpretty<0.8.7,>=0.8.4
 mock==1.0.1;python_version=='2.6'
 mock>=1.1;python_version!='2.6'
+Babel>=1.3
 oslosphinx>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.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

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