Merge "Remove requirements style check"

requirements.txt

@@ -1,3 +1,10 @@
+# Order matters to the pip dependency resolver, so sorting this file
+# changes how packages are installed.  New dependencies should be
+# added in alphabetical order, however, some dependencies may need to
+# be installed in a specific order.
+#
+# PBR should always appear first
+pbr>=0.6,!=0.7,<1.0
 # Horizon Core Requirements
 Django>=1.4,<1.7
 django_compressor>=1.4
@@ -11,7 +18,6 @@ kombu>=2.4.8
 # for SECURE_KEY generation
 lockfile>=0.8
 netaddr>=0.7.6
-pbr>=0.6,!=0.7,<1.0
 pyscss>=1.2.0  # MIT License
 python-ceilometerclient>=1.0.6
 python-cinderclient>=1.0.7

test-requirements.txt

@@ -1,7 +1,14 @@
+# Order matters to the pip dependency resolver, so sorting this file
+# changes how packages are installed.  New dependencies should be
+# added in alphabetical order, however, some dependencies may need to
+# be installed in a specific order.
+#
+# Hacking should appear first in case something else depends on pep8
+hacking>=0.9.2,<0.10
+#
 coverage>=3.6
 django-nose
 docutils==0.9.1
-hacking>=0.9.2,<0.10
 mox>=0.5.3
 nodeenv>=0.9.4 # BSD License
 nose

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

@@ -18,7 +18,6 @@ commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
 
 [testenv:pep8]
 commands = /bin/bash run_tests.sh -N --pep8
-           {toxinidir}/tools/requirements_style_check.sh requirements.txt test-requirements.txt
 
 [testenv:venv]
 commands = {posargs}