Fix on setup.py after merge
This commit is contained in:
parent
623b467c95
commit
ce3e05b7b0
|
@ -132,6 +132,7 @@ class OfficialClientManager(fuel_health.manager.Manager):
|
|||
raise exceptions.InvalidConfiguration(msg)
|
||||
|
||||
auth_url = self.config.identity.uri
|
||||
LOG.debug(auth_url)
|
||||
dscv = self.config.identity.disable_ssl_certificate_validation
|
||||
|
||||
return keystoneclient.v2_0.client.Client(username=username,
|
||||
|
|
155
setup.py
155
setup.py
|
@ -14,125 +14,80 @@
|
|||
|
||||
import multiprocessing
|
||||
import setuptools
|
||||
<<<<<<< HEAD
|
||||
requirements=[
|
||||
'argparse==1.2.1',
|
||||
'cliff==1.4',
|
||||
'cmd2==0.6.5.1',
|
||||
'd2to1==0.2.10',
|
||||
'distribute==0.7.3',
|
||||
'extras==0.0.3',
|
||||
'httplib2==0.8',
|
||||
'iso8601==0.1.4',
|
||||
'jsonpatch==1.1',
|
||||
'jsonpointer==1.0',
|
||||
'jsonschema==2.0.0',
|
||||
'netaddr==0.7.10',
|
||||
'nose==1.3.0',
|
||||
'oslo.config==1.1.1',
|
||||
'paramiko==1.10.1',
|
||||
'pbr==0.5.21',
|
||||
'pika==0.9.13',
|
||||
'prettytable==0.7.2',
|
||||
'pyOpenSSL==0.13',
|
||||
'pycrypto==2.6',
|
||||
'pyparsing==1.5.7',
|
||||
'python-cinderclient==1.0.4',
|
||||
'python-glanceclient==0.9.0',
|
||||
'python-keystoneclient==0.3.1',
|
||||
'python-mimeparse==0.1.4',
|
||||
'python-novaclient==2.13.0',
|
||||
'python-neutronclient>=2.2',
|
||||
'requests==1.2.3',
|
||||
'setuptools-git==1.0',
|
||||
'simplejson==3.3.0',
|
||||
'unittest2',
|
||||
'six==1.3.0',
|
||||
'testresources==0.2.7',
|
||||
'warlock==1.0.1',
|
||||
'wsgiref==0.1.2',
|
||||
'savannaclient==0.1',
|
||||
],
|
||||
|
||||
|
||||
setuptools.setup(
|
||||
name='ostf_tests',
|
||||
=======
|
||||
|
||||
|
||||
fuel_health_reqs = [
|
||||
'oslo.config>=1.1.1',
|
||||
'python-cinderclient>=1.0.4',
|
||||
'python-glanceclient>=0.9.0',
|
||||
'python-keystoneclient>=0.3.1',
|
||||
'python-novaclient>=2.13.0',
|
||||
'paramiko>=1.10.1',
|
||||
'requests>=1.1,<1.2.3',
|
||||
'unittest2>=0.5.1',
|
||||
'pyyaml>=3.10',
|
||||
'testresources>=0.2.7'
|
||||
'oslo.config>=1.1.1',
|
||||
'python-cinderclient>=1.0.4',
|
||||
'python-glanceclient>=0.9.0',
|
||||
'python-keystoneclient>=0.3.1',
|
||||
'python-novaclient>=2.13.0',
|
||||
'paramiko>=1.10.1',
|
||||
'requests>=1.1,<1.2.3',
|
||||
'unittest2>=0.5.1',
|
||||
'pyyaml>=3.10',
|
||||
'testresources>=0.2.7'
|
||||
]
|
||||
|
||||
fuel_ostf_reqs = [
|
||||
'nose>=1.3.0',
|
||||
'SQLAlchemy>=0.8.2',
|
||||
'alembic>=0.5.0',
|
||||
'gevent==0.13.8',
|
||||
'pecan>=0.3.0',
|
||||
'psycopg2>=2.5.1',
|
||||
'stevedore>=0.10'
|
||||
'nose>=1.3.0',
|
||||
'SQLAlchemy>=0.8.2',
|
||||
'alembic>=0.5.0',
|
||||
'gevent==0.13.8',
|
||||
'pecan>=0.3.0',
|
||||
'psycopg2>=2.5.1',
|
||||
'stevedore>=0.10'
|
||||
]
|
||||
|
||||
test_requires = [
|
||||
'mock==1.0.1',
|
||||
'pep8==1.4.6',
|
||||
'py==1.4.15',
|
||||
'six==1.3.0',
|
||||
'tox==1.5.0',
|
||||
'unittest2',
|
||||
'nose',
|
||||
'requests'
|
||||
'mock==1.0.1',
|
||||
'pep8==1.4.6',
|
||||
'py==1.4.15',
|
||||
'six==1.3.0',
|
||||
'tox==1.5.0',
|
||||
'unittest2',
|
||||
'nose',
|
||||
'requests'
|
||||
]
|
||||
|
||||
|
||||
setuptools.setup(
|
||||
|
||||
name='fuel_ostf',
|
||||
>>>>>>> upstream/master
|
||||
version='0.1',
|
||||
name='fuel_ostf',
|
||||
version='0.1',
|
||||
|
||||
description='cloud computing testing',
|
||||
description='cloud computing testing',
|
||||
|
||||
zip_safe=False,
|
||||
zip_safe=False,
|
||||
|
||||
classifiers=[
|
||||
'Development Status :: 3 - Alpha',
|
||||
'Framework :: Setuptools Plugin',
|
||||
'Environment :: OpenStack',
|
||||
'Intended Audience :: Information Technology',
|
||||
'Intended Audience :: System Administrators',
|
||||
'License :: OSI Approved :: Apache Software License',
|
||||
'Operating System :: POSIX :: Linux',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Topic :: System :: Testing',
|
||||
],
|
||||
classifiers=[
|
||||
'Development Status :: 3 - Alpha',
|
||||
'Framework :: Setuptools Plugin',
|
||||
'Environment :: OpenStack',
|
||||
'Intended Audience :: Information Technology',
|
||||
'Intended Audience :: System Administrators',
|
||||
'License :: OSI Approved :: Apache Software License',
|
||||
'Operating System :: POSIX :: Linux',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Topic :: System :: Testing',
|
||||
],
|
||||
|
||||
packages=setuptools.find_packages(),
|
||||
packages=setuptools.find_packages(),
|
||||
|
||||
install_requires=fuel_health_reqs+fuel_ostf_reqs,
|
||||
install_requires=fuel_health_reqs+fuel_ostf_reqs,
|
||||
|
||||
entry_points={
|
||||
'plugins': [
|
||||
('nose = fuel_plugin.ostf_adapter.'
|
||||
'nose_plugin.nose_adapter:NoseDriver')
|
||||
],
|
||||
'console_scripts': [
|
||||
'ostf-server = fuel_plugin.bin.adapter_api:main',
|
||||
('update-commands = fuel_plugin.tests.'
|
||||
'test_utils.update_commands:main')
|
||||
]
|
||||
},
|
||||
entry_points={
|
||||
'plugins': [
|
||||
('nose = fuel_plugin.ostf_adapter.'
|
||||
'nose_plugin.nose_adapter:NoseDriver')
|
||||
],
|
||||
'console_scripts': [
|
||||
'ostf-server = fuel_plugin.bin.adapter_api:main',
|
||||
('update-commands = fuel_plugin.tests.'
|
||||
'test_utils.update_commands:main')
|
||||
]
|
||||
},
|
||||
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue