Merge "Updated from global requirements"
This commit is contained in:
commit
247f4d70b3
@ -7,10 +7,10 @@
|
||||
# be installed in a specific order.
|
||||
#
|
||||
# PBR should always appear first
|
||||
pbr>=2.0.0,!=2.1.0 # Apache-2.0
|
||||
Django>=1.8,<2.0 # BSD
|
||||
django-babel>=0.5.1 # BSD
|
||||
django-compressor>=2.0 # MIT
|
||||
django-nose>=1.4.4 # BSD
|
||||
keystoneauth1>=3.3.0 # Apache-2.0
|
||||
python-congressclient>=1.9.0,<2000 # Apache-2.0
|
||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||
Django<2.0,>=1.8 # BSD
|
||||
django-babel>=0.5.1 # BSD
|
||||
django-compressor>=2.0 # MIT
|
||||
django-nose>=1.4.4 # BSD
|
||||
keystoneauth1>=3.3.0 # Apache-2.0
|
||||
python-congressclient<2000,>=1.9.0 # Apache-2.0
|
||||
|
2
setup.py
2
setup.py
@ -1,3 +1,5 @@
|
||||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
|
@ -7,16 +7,16 @@
|
||||
# be installed in a specific order.
|
||||
#
|
||||
# Hacking should appear first in case something else depends on pep8
|
||||
hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
|
||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||
|
||||
#Testing Requirements
|
||||
coverage>=4.0,!=4.4 # Apache-2.0
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
|
||||
# Docs Requirements
|
||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
docutils>=0.11 # OSI-Approved Open Source, Public Domain
|
||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
docutils>=0.11 # OSI-Approved Open Source, Public Domain
|
||||
|
||||
# Include horizon as test requirement
|
||||
http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
|
||||
|
Loading…
Reference in New Issue
Block a user