Skip to content

Commit 6c9ada0

Browse files
committed
setup,py,requirements.txt: add pytest
pytest requires pluggy >= 0.7, while we always use pluggy 0.6, as specified by requirements.txt. as this version is good enough for tox. but in tox.ini, we do use pytest, and no version is specified, so we have good chance running into pytest-dev/pytest#3753 Signed-off-by: Kefu Chai <[email protected]>
1 parent 6f716c4 commit 6c9ada0

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

requirements.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ apache-libcloud==1.5.0
99
appdirs==1.4.3 # via os-client-config
1010
argparse==1.4.0
1111
asn1crypto==0.22.0 # via cryptography
12+
atomicwrites==1.1.5 # via pytest
13+
attrs==18.1.0 # via pytest
1214
babel==2.4.0 # via osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-neutronclient, python-novaclient, python-openstackclient
1315
backports.ssl-match-hostname==3.5.0.1
1416
beanstalkc==0.4.0
@@ -27,7 +29,7 @@ deprecation==1.0 # via openstacksdk
2729
docopt==0.6.2
2830
enum34==1.1.6 # via cryptography
2931
first==2.0.1 # via pip-tools
30-
funcsigs==1.0.2 # via debtcollector, oslo.utils
32+
funcsigs==1.0.2 # via debtcollector, oslo.utils, pytest
3133
functools32==3.2.3.post2 # via jsonschema
3234
gevent==1.2.1
3335
greenlet==0.4.12 # via gevent
@@ -40,10 +42,10 @@ jsonpatch==1.15 # via warlock
4042
jsonpointer==1.10 # via jsonpatch
4143
jsonschema==2.6.0 # via warlock
4244
keystoneauth1==2.19.0 # via openstacksdk, os-client-config, osc-lib, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient
43-
libvirt-python
4445
manhole==1.3.0
4546
markupsafe==1.0 # via jinja2
4647
monotonic==1.3 # via oslo.utils
48+
more-itertools==4.3.0 # via pytest
4749
msgpack-python==0.4.8 # via oslo.serialization
4850
mysql-python==1.2.3
4951
ndg-httpsclient==0.4.2
@@ -58,19 +60,21 @@ oslo.i18n==3.15.0 # via osc-lib, oslo.config, oslo.utils, python-cinderc
5860
oslo.serialization==2.18.0 # via python-keystoneclient, python-neutronclient, python-novaclient
5961
oslo.utils==3.25.0 # via osc-lib, oslo.serialization, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient
6062
paramiko==2.1.2
63+
pathlib2==2.3.2 # via pytest
6164
pbr==2.0.0 # via cliff, debtcollector, keystoneauth1, openstacksdk, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, positional, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, requestsexceptions, stevedore
6265
pexpect==4.2.1
6366
pip-tools==1.10.1
64-
pluggy==0.6.0 # via tox
67+
pluggy==0.7.1 # via pytest, tox
6568
positional==1.1.1 # via keystoneauth1, python-keystoneclient
6669
prettytable==0.7.2
6770
psutil==5.2.2
6871
ptyprocess==0.5.1 # via pexpect
69-
py==1.5.3 # via tox
72+
py==1.5.3 # via pytest, tox
7073
pyasn1==0.2.3
7174
pycparser==2.17 # via cffi
7275
pyopenssl==16.2.0
7376
pyparsing==2.2.0 # via cliff, cmd2, oslo.utils
77+
pytest==3.7.1
7478
python-cinderclient==2.0.1 # via python-openstackclient
7579
python-dateutil==2.6.0
7680
python-glanceclient==2.6.0 # via python-openstackclient
@@ -84,6 +88,7 @@ raven==6.0.0
8488
requests==2.12.5
8589
requestsexceptions==1.2.0 # via os-client-config
8690
rfc3986==0.4.1 # via oslo.config
91+
scandir==1.8 # via pathlib2
8792
simplejson==3.10.0 # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient
8893
six==1.10.0
8994
stevedore==1.21.0 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-keystoneclient

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
'httplib2',
6464
'paramiko',
6565
'pexpect',
66+
'pytest', # for tox.ini
6667
'nose', # for qa/tasks/rgw_multisite_tests.py',
6768
'requests != 2.13.0',
6869
'raven',

0 commit comments

Comments
 (0)