Skip to content

Commit 54f03df

Browse files
committed
Declare min/max versions of all our dependencies
1 parent 17499b9 commit 54f03df

File tree

5 files changed

+29
-25
lines changed

5 files changed

+29
-25
lines changed

requirements-optional.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
# We support a Genshi treewalker that can be used to serialize Genshi
44
# streams.
5-
genshi
5+
genshi>=0.7,<2.0
66

77
# chardet can be used as a fallback in case we are unable to determine
88
# the encoding of a document.
9-
chardet>=2.2
9+
chardet>=2.2.1,<3.0
1010

1111
# lxml is supported with its own treebuilder ("lxml") and otherwise
1212
# uses the standard ElementTree support
13-
lxml ; platform_python_implementation == 'CPython'
13+
lxml>=2.3,<4.0 ; platform_python_implementation == 'CPython'
1414

1515
# DATrie can be used in place of our Python trie implementation for
1616
# slightly better parsing performance.
17-
datrie ; platform_python_implementation == 'CPython'
17+
datrie>=0.5,<2.0 ; platform_python_implementation == 'CPython'

requirements-test.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
-r requirements.txt
22

3-
flake8<3.0
4-
pytest
3+
flake8==2.6.2
4+
pycodestyle==2.0.0
5+
pyflakes==1.2.3
6+
pytest>=2.7,<4.0
57
pytest-expect>=1.1,<2.0
6-
mock
8+
mock>=0.7,<3.0

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
six>=1.9
2-
webencodings
3-
ordereddict ; python_version < '2.7'
1+
six>=1.9,<2.0
2+
webencodings>=0.5,<0.6
3+
ordereddict>=1.1,<2.0 ; python_version < '2.7'

setup.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,28 +102,28 @@ def default_environment():
102102
maintainer_email='james@hoppipolla.co.uk',
103103
packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
104104
install_requires=[
105-
'six>=1.9',
106-
'webencodings',
105+
'six>=1.9,<2.0',
106+
'webencodings>=0.5,<0.6',
107107
],
108108
extras_require={
109109
# A empty extra that only has a conditional marker will be
110110
# unconditonally installed when the condition matches.
111-
":python_version == '2.6'": ["ordereddict"],
111+
":python_version == '2.6'": ["ordereddict>=1.1,<2.0"],
112112

113113
# A conditional extra will only install these items when the extra is
114114
# requested and the condition matches.
115-
"datrie:platform_python_implementation == 'CPython'": ["datrie"],
116-
"lxml:platform_python_implementation == 'CPython'": ["lxml"],
115+
"datrie:platform_python_implementation == 'CPython'": ["datrie>=0.5,<2.0"],
116+
"lxml:platform_python_implementation == 'CPython'": ["lxml>=2.3,<4.0"],
117117

118118
# Standard extras, will be installed when the extra is requested.
119-
"genshi": ["genshi"],
120-
"chardet": ["chardet>=2.2"],
119+
"genshi": ["genshi>=0.7,<2.0"],
120+
"chardet": ["chardet>=2.2.1,<3.0"],
121121

122122
# The all extra combines a standard extra which will be used anytime
123123
# the all extra is requested, and it extends it with a conditional
124124
# extra that will be installed whenever the condition matches and the
125125
# all extra is requested.
126-
"all": ["genshi", "chardet>=2.2"],
127-
"all:platform_python_implementation == 'CPython'": ["datrie", "lxml"],
126+
"all": ["genshi>=0.7,<2.0", "chardet>=2.2,<3.0"],
127+
"all:platform_python_implementation == 'CPython'": ["datrie>=0.5,<2.0", "lxml>=2.3,<4.0"],
128128
},
129129
)

tox.ini

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ envlist = {py26,py27,py33,py34,py35,pypy}-{base,optional}
33

44
[testenv]
55
deps =
6-
flake8<3.0
7-
pytest
6+
flake8==2.6.2
7+
pycodestyle==2.0.0
8+
pyflakes==1.2.3
9+
pytest>=2.7,<4.0
810
pytest-expect>=1.1,<2.0
9-
mock
10-
base: six
11-
base: webencodings
12-
py26-base: ordereddict
11+
mock>=0.7,<3.0
12+
base: six>=1.9,<2.0
13+
base: webencodings>=0.5,<0.6
14+
py26-base: ordereddict>=1.1,<2.0
1315
optional: -r{toxinidir}/requirements-optional.txt
1416

1517
commands =

0 commit comments

Comments
 (0)