Pin sphinx to <2.0.0
The 2.0.0 release introduces a requirement for using python3.5 but we are running this in python 2.7 (cherry picked from commitd2b1c67d57
) Switch to using stestr According to Openstack summit session [1] stestr is maintained project to which all Openstack projects should migrate. Let's switch it then. [1] https://etherpad.openstack.org/p/YVR-python-pti Signed-off-by: Charles Short <zulcss@gmail.com> (cherry picked from commitb64b16f5a2
) Also, pinned puppet-redis and updated pin of puppet-stdlib to the same pins we have in RDO. Change-Id: I055ab99e48e018d041a2aef7c8998f72ebd4ff5e
This commit is contained in:
parent
5339721c87
commit
30ecf15044
|
@ -2,8 +2,8 @@
|
||||||
*.swp
|
*.swp
|
||||||
*.log
|
*.log
|
||||||
.tox
|
.tox
|
||||||
.testrepository/
|
|
||||||
vendor/*
|
vendor/*
|
||||||
Gemfile.lock
|
Gemfile.lock
|
||||||
packstack.egg-info
|
packstack.egg-info
|
||||||
releasenotes/build
|
releasenotes/build
|
||||||
|
.stestr
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
[DEFAULT]
|
||||||
|
test_path=./tests
|
||||||
|
top_dir=./
|
|
@ -134,7 +134,7 @@ mod 'rabbitmq',
|
||||||
|
|
||||||
mod 'redis',
|
mod 'redis',
|
||||||
:git => 'https://github.com/arioch/puppet-redis',
|
:git => 'https://github.com/arioch/puppet-redis',
|
||||||
:ref => 'master'
|
:ref => 'bfcc2120f7b83342b03241d1429028a6defdd0da'
|
||||||
|
|
||||||
mod 'remote',
|
mod 'remote',
|
||||||
:git => 'https://github.com/paramite/puppet-remote',
|
:git => 'https://github.com/paramite/puppet-remote',
|
||||||
|
@ -150,7 +150,7 @@ mod 'ssh',
|
||||||
|
|
||||||
mod 'stdlib',
|
mod 'stdlib',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib',
|
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib',
|
||||||
:ref => '4.18.0'
|
:ref => '4.24.0'
|
||||||
|
|
||||||
mod 'sysctl',
|
mod 'sysctl',
|
||||||
:git => 'https://github.com/duritong/puppet-sysctl',
|
:git => 'https://github.com/duritong/puppet-sysctl',
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
sphinx>=1.6.2 # BSD
|
sphinx>=1.6.2,<2.0.0 # BSD
|
||||||
openstackdocstheme>=1.17.0 # Apache-2.0
|
openstackdocstheme>=1.17.0 # Apache-2.0
|
||||||
reno>=0.1.1 # Apache2
|
reno>=0.1.1 # Apache2
|
||||||
os-testr>=0.4.1 # Apache-2.0
|
stestr>=1.0.0 # Apache-2.0
|
||||||
coverage
|
coverage
|
||||||
hacking!=0.13.0,<0.14,>=0.12.0
|
hacking!=0.13.0,<0.14,>=0.12.0
|
||||||
mock>=2.0 # BSD
|
mock>=2.0 # BSD
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = /usr/bin/find . -type f -name "*.pyc" -delete
|
commands = /usr/bin/find . -type f -name "*.pyc" -delete
|
||||||
ostestr {posargs}
|
stestr run {posargs}
|
||||||
|
|
||||||
[tox:jenkins]
|
[tox:jenkins]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
|
|
Loading…
Reference in New Issue