diff options
| author | Doug Hellmann <doug.hellmann@dreamhost.com> | 2014-05-05 15:42:12 -0700 |
|---|---|---|
| committer | Ihar Hrachyshka <ihrachys@redhat.com> | 2015-06-01 12:41:56 +0200 |
| commit | 1f909b0230690c6e12e1904bd171a29a21c40dd8 (patch) | |
| tree | b3072b79dbf9f8f004d14f2985eea380375cb96a | |
| parent | 1a0556f0379061de2c12b5b34d790381a0e0674e (diff) | |
| download | oslo-incubator-1f909b0230690c6e12e1904bd171a29a21c40dd8.tar.gz | |
Remove requirements_style_check.sh
Per mordred, requirements should be listed in the order they
need to be installed, since pip doesn't "fix" anything listed
in the wrong order.
See also https://review.openstack.org/#/c/92221/
Conflicts:
requirements.txt
Change-Id: I467a3e597ffca24de01ed3d6bcbc26bd1501353b
(cherry picked from commit 93db699a99793288464fe56de27bcf676fcedd17)
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rwxr-xr-x | tools/requirements_style_check.sh | 32 | ||||
| -rw-r--r-- | tox.ini | 1 |
3 files changed, 1 insertions, 34 deletions
diff --git a/requirements.txt b/requirements.txt index c501f732..f99146aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +pbr>=0.6,<1.0 alembic>=0.4.1,<=0.7.5.post2 anyjson>=0.3.3,<=0.3.3 argparse @@ -11,7 +12,6 @@ lockfile>=0.8,<=0.10.2 netaddr>=0.7.6,<=0.7.14 oslo.config>=1.2.0,<1.5 PasteDeploy>=1.5.0,<=1.5.2 -pbr>=0.6,<1.0 posix_ipc PrettyTable>=0.7,<0.8 pycadf>=0.4.1,<0.6.0 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 @@ -38,7 +38,6 @@ exclude = .venv,.tox,dist,doc,*.egg,.update-venv [testenv:pep8] commands = flake8 {posargs} python ./tools/check_maintainers.py - {toxinidir}/tools/requirements_style_check.sh requirements.txt test-requirements.txt requirements-py3.txt test-requirements-py3.txt [testenv:pylint] deps = pylint>=0.26.0 |