Updated from global requirements
Change-Id: I65149149fd5b80e93961206f1c9e2037db764b84
This commit is contained in:
		@@ -1,8 +1,8 @@
 | 
			
		||||
pbr>=0.6,<1.0
 | 
			
		||||
pbr>=0.6,!=0.7,<1.0
 | 
			
		||||
argparse
 | 
			
		||||
PrettyTable>=0.7,<0.8
 | 
			
		||||
python-keystoneclient>=0.7.0
 | 
			
		||||
python-keystoneclient>=0.9.0
 | 
			
		||||
requests>=1.1
 | 
			
		||||
simplejson>=2.0.9
 | 
			
		||||
Babel>=1.3
 | 
			
		||||
six>=1.5.2
 | 
			
		||||
six>=1.6.0
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								setup.py
									
									
									
									
									
								
							@@ -17,6 +17,14 @@
 | 
			
		||||
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 | 
			
		||||
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(
 | 
			
		||||
    setup_requires=['pbr'],
 | 
			
		||||
    pbr=True)
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,6 @@ discover
 | 
			
		||||
fixtures>=0.3.14
 | 
			
		||||
mock>=1.0
 | 
			
		||||
python-subunit>=0.0.18
 | 
			
		||||
sphinx>=1.1.2,<1.2
 | 
			
		||||
sphinx>=1.2.1,<1.3
 | 
			
		||||
testtools>=0.9.34
 | 
			
		||||
testrepository>=0.0.18
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user