warn against sorting requirements

And do not check for sorted requirements.

Change-Id: I64ae9191863564e278a35d42ec9cd743a233028e
Closes-Bug: 1365061

4 files changed, 11 insertions, 36 deletions

diff --git a/requirements.txt b/requirements.txt
index bacb378..f06e9d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,10 @@
+# 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>=0.6,!=0.7,<1.0
 argparse
 iso8601>=0.1.9
-pbr>=0.6,!=0.7,<1.0
 PrettyTable>=0.7,<0.8
 python-keystoneclient>=0.10.0
 PyYAML>=3.1.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 39e02d0..7059bc0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,12 @@
+# 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.
+
+# Hacking already pins down pep8, pyflakes and flake8
+hacking>=0.8.0,<0.9
 coverage>=3.6
 discover
 fixtures>=0.3.14
-# Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
 httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
 mock>=1.0
 mox3>=0.7.0
diff --git a/tools/requirements_style_check.sh b/tools/requirements_style_check.sh
deleted file mode 100755
index ccbff3b..0000000
--- a/tools/requirements_style_check.sh
+++ /dev/null
@@ -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
diff --git a/tox.ini b/tox.ini
index c23bf85..f1f3c54 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,6 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
 commands = flake8
-           {toxinidir}/tools/requirements_style_check.sh requirements.txt test-requirements.txt
 
 [testenv:venv]
 commands = {posargs}