From 636a9a63262da1fd53eac0cc7463755091cdce8b Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 5 May 2014 15:27:31 -0700
Subject: [PATCH] Remove requirements_style_check

Requirements files should not be kept in alphabetical order, because
pip does not actually have a dep solver. Order is important. This file
should never have existed. While doing this, put pbr at the top of
the file, which is where it needs to be, and remove setuptools_git
which should no longer be used.

Change-Id: I1ae61c1c5ce66ed15fbdefbee063997ea6f3172c
---
 requirements.txt                  |  3 +--
 tools/requirements_style_check.sh | 32 -------------------------------
 tox.ini                           |  1 -
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100755 tools/requirements_style_check.sh

diff --git a/requirements.txt b/requirements.txt
index 0d09ab92..98f40ef0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+pbr>=0.5.21,<1.0
 
 amqplib>=0.6.1
 anyjson>=0.3.3
@@ -11,14 +12,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
diff --git a/tools/requirements_style_check.sh b/tools/requirements_style_check.sh
deleted file mode 100755
index ccbff3bd..00000000
--- 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 18793aa6..6677585b 100644
--- a/tox.ini
+++ b/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}