Skip to content

Commit 5b30287

Browse files
author
James E. Blair
committed
Remove requirements style check
This is incorrect and should never have been added. The order of lines in requirements files affects the pip dependency resolver. Therefore, while it's nice to add new packages in alphabetical order, it must not be required. Move pbr to the top of the list as it should always be installed first. Move hacking to the top of the test-requires list. Change-Id: I81f7e75b77baccd12d9660dc009f30f2f2c891bc
1 parent 82bf9ee commit 5b30287

File tree

4 files changed

+15
-35
lines changed

4 files changed

+15
-35
lines changed

requirements.txt

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

test-requirements.txt

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

tools/requirements_style_check.sh

-32
This file was deleted.

tox.ini

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
1818

1919
[testenv:pep8]
2020
commands = /bin/bash run_tests.sh -N --pep8
21-
{toxinidir}/tools/requirements_style_check.sh requirements.txt test-requirements.txt
2221

2322
[testenv:venv]
2423
commands = {posargs}

0 commit comments

Comments
 (0)