warn against sorting requirements
And do not check for sorted requirements. Change-Id: I64ae9191863564e278a35d42ec9cd743a233028e Closes-Bug: 1365061
This commit is contained in:
parent
407a69995d
commit
85d665e511
@ -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
|
argparse
|
||||||
iso8601>=0.1.9
|
iso8601>=0.1.9
|
||||||
pbr>=0.6,!=0.7,<1.0
|
|
||||||
PrettyTable>=0.7,<0.8
|
PrettyTable>=0.7,<0.8
|
||||||
python-keystoneclient>=0.10.0
|
python-keystoneclient>=0.10.0
|
||||||
PyYAML>=3.1.0
|
PyYAML>=3.1.0
|
||||||
|
@ -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
|
coverage>=3.6
|
||||||
discover
|
discover
|
||||||
fixtures>=0.3.14
|
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
|
httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
|
||||||
mock>=1.0
|
mock>=1.0
|
||||||
mox3>=0.7.0
|
mox3>=0.7.0
|
||||||
|
@ -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
|
|
1
tox.ini
1
tox.ini
@ -16,7 +16,6 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
|
|||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
commands = flake8
|
commands = flake8
|
||||||
{toxinidir}/tools/requirements_style_check.sh requirements.txt test-requirements.txt
|
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user