Updated from global requirements
Change-Id: If78e9c6525d1c1e07c99d94a297f0e201d70bc38
This commit is contained in:
parent
6a15520f72
commit
5f006b2eb7
|
@ -1,10 +1,14 @@
|
||||||
|
# The order of packages is significant, because pip processes them in the order
|
||||||
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
|
# process, which may cause wedges in the gate later.
|
||||||
pbr>=0.6,!=0.7,<1.0
|
pbr>=0.6,!=0.7,<1.0
|
||||||
|
|
||||||
anyjson>=0.3.3
|
anyjson>=0.3.3
|
||||||
iso8601>=0.1.9
|
iso8601>=0.1.9
|
||||||
six>=1.7.0
|
six>=1.7.0
|
||||||
PyYAML>=3.1.0
|
PyYAML>=3.1.0
|
||||||
django-floppyforms>=1.1
|
|
||||||
|
|
||||||
# not listed in global requirements
|
# not listed in global requirements
|
||||||
|
django-floppyforms>=1.1
|
||||||
yaql>=0.2.3,<0.3
|
yaql>=0.2.3,<0.3
|
||||||
python-muranoclient>=0.5.5
|
python-muranoclient>=0.5.5
|
||||||
|
|
8
setup.py
8
setup.py
|
@ -17,6 +17,14 @@
|
||||||
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
|
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
|
# In python < 2.7.4, a lazy loading of package `pbr` will break
|
||||||
|
# setuptools if some other modules registered functions in `atexit`.
|
||||||
|
# solution from: http://bugs.python.org/issue15881#msg170215
|
||||||
|
try:
|
||||||
|
import multiprocessing # noqa
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
setup_requires=['pbr'],
|
setup_requires=['pbr'],
|
||||||
pbr=True)
|
pbr=True)
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# The order of packages is significant, because pip processes them in the order
|
||||||
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
|
# process, which may cause wedges in the gate later.
|
||||||
hacking>=0.8.0,<0.9
|
hacking>=0.8.0,<0.9
|
||||||
|
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
|
@ -7,15 +10,14 @@ openstack.nose_plugin>=0.7
|
||||||
nosehtmloutput>=0.0.3
|
nosehtmloutput>=0.0.3
|
||||||
selenium
|
selenium
|
||||||
|
|
||||||
testtools>=0.9.34
|
testtools>=0.9.36,!=1.2.0
|
||||||
mock>=1.0
|
mock>=1.0
|
||||||
mox>=0.5.3
|
mox>=0.5.3
|
||||||
|
|
||||||
# Docs Requirements
|
# Docs Requirements
|
||||||
sphinx>=1.1.2,<1.2
|
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
||||||
docutils==0.9.1
|
|
||||||
|
|
||||||
# Horizon requirements
|
# Horizon requirements
|
||||||
Django>=1.4,<1.7
|
Django>=1.4.2,<1.7
|
||||||
django_compressor>=1.3
|
django_compressor>=1.4
|
||||||
django_openstack_auth>=1.1.4
|
django_openstack_auth>=1.1.7
|
||||||
|
|
Loading…
Reference in New Issue