x/valet
Code Issues Proposed changes

Fix requirements.txt and test-requirements.txt

Browse Source 
This patch set fixes the requirements, and two workarounds in the
documentation due to the previously broken requirements.

Change-Id: I3e2e7ec5897270f266ba5ea84c9927f7623b4483
This commit is contained in:
Tin Lam 2017-05-25 19:12:59 -05:00
parent 7254f9ec97
commit 66ef9173a9
4 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/conf.py
View File

@ -50,11 +50,9 @@ extensions = [
'sphinx.ext.viewcode',
]
# TODO(lamt) We need to enable oslosphix whenever we can get pass the
# check-requirements gate.
# on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
# if not on_rtd:
# extensions.append('oslosphinx')
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
if not on_rtd:
extensions.append('oslosphinx')
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

32
requirements.txt
View File

@ -2,13 +2,27 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pip
pecan>=1.1.1
pbr!=2.1.0,>=2.0.0 # Apache-2.0
pecan>=1.0.0,!=1.0.2,!=1.0.3,!=1.0.4,!=1.2 # BSD
simplejson>=2.2.0 # MIT
pika>=0.10.0 # BSD
Routes>=2.3.1 # MIT
six>=1.9.0 # MIT
# 2013.6 is the first version of pytz that is PEP 440 compatible.
pytz>=2013.6 # MIT
python-keystoneclient>=3.8.0 # Apache-2.0
python-heatclient>=1.6.1 # Apache-2.0
python-novaclient>=7.1.0 # Apache-2.0
oslo.config>=3.22.0 # Apache-2.0
oslo.db>=4.21.1 # Apache-2.0
oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
oslo.log>=3.22.0 # Apache-2.0
oslo.messaging>=5.19.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.20.0 # Apache-2.0
notario<=0.0.11
pecan-notario<=0.0.3
simplejson<=3.3.1
#pymysql
#sqlalchemy
pika<=0.10.0
python-daemon
#oslo.messaging!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1,!=2.7.0,!=2.8.0,!=2.8.1,!=2.9.0,!=3.1.0,>=1.16.0 # Apache-2.0
#oslo.messaging==1.8.3

3
setup.cfg
View File

@ -26,8 +26,7 @@ builders = html,man
all_files = 1
build-dir = doc/build
source-dir = doc/source
# TODO(lamt) Need to uncomment this whenever we can update the requirements
# warning-is-error = 1
warning-is-error = 1
[files]
packages = valet

43
test-requirements.txt
View File

@ -2,28 +2,25 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking<0.11,>=0.10.0
os-testr<=0.7.0
markupsafe<=0.23
pecan<=0.8.2
notario<=0.0.11
coverage>=3.6
python-subunit>=0.0.18
mock>=1.2
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
mock>=2.0 # BSD
bashate>=0.2 # Apache-2.0
os-testr>=0.8.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
oslotest>=1.10.0 # Apache-2.0
oslo.config>=1.9.0
testrepository>=0.0.18
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
testscenarios>=0.4
testtools>=1.4.0
oslo.i18n<=3.8.0
oslo.log>=1.0.0
pytz
python-keystoneclient<=3.4.0
python-novaclient<=4.0.0
python-heatclient<=1.2.0
oslo.messaging==1.8.3
#tempest<=12.1.0 ---------- needs to be installed on Jenkins, no output when using tox
#tempest-lib>=0.8.0
# For documentation
sphinx!=1.6.1,>=1.5.1 # BSD
oslosphinx>=4.7.0 # Apache-2.0
reno>=1.8.0 # Apache-2.0
os-api-ref>=1.0.0 # Apache-2.0
# Tempest
tempest>=14.0.0 # Apache-2.0
# Functional tests.
requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0