Update to pbr/d2to1.
Change-Id: I5f4bb2cb3d068fec24a58b7d9b395b9cc31fa613
This commit is contained in:
Monty Taylor
Michael Basnight
parent
684daae39f
commit
257d4a8601
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,7 +1,10 @@
|
||||
*.pyc
|
||||
.tox/*
|
||||
dist/*
|
||||
build/*
|
||||
html/*
|
||||
python_reddwarfclient.egg*
|
||||
python_troveclient.egg*
|
||||
rdserver.txt
|
||||
python-reddwarfclient.iml
|
||||
python-troveclient.iml
|
||||
AUTHORS
|
||||
ChangeLog
|
||||
|
||||
28
docs/conf.py
28
docs/conf.py
@ -1,28 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import sys, os
|
||||
|
||||
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.coverage']
|
||||
|
||||
templates_path = ['_templates']
|
||||
|
||||
source_suffix = '.rst'
|
||||
|
||||
master_doc = 'index'
|
||||
|
||||
project = u'python-reddwarfclient'
|
||||
copyright = u'2012, OpenStack'
|
||||
|
||||
version = '1.0'
|
||||
release = '1.0'
|
||||
exclude_trees = []
|
||||
|
||||
pygments_style = 'sphinx'
|
||||
|
||||
html_theme = 'default'
|
||||
html_static_path = ['_static']
|
||||
htmlhelp_basename = 'python-reddwarfclientdoc'
|
||||
latex_documents = [
|
||||
('index', 'python-reddwarfclient.tex', u'python-reddwarfclient Documentation',
|
||||
u'OpenStack', 'manual'),
|
||||
]
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import sys, os
|
||||
|
||||
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.coverage']
|
||||
extensions = [
|
||||
'sphinx.ext.autodoc',
|
||||
'sphinx.ext.doctest',
|
||||
'sphinx.ext.coverage'
|
||||
]
|
||||
|
||||
templates_path = ['_templates']
|
||||
|
||||
@ -9,20 +12,17 @@ source_suffix = '.rst'
|
||||
|
||||
master_doc = 'index'
|
||||
|
||||
project = u'python-reddwarfclient'
|
||||
copyright = u'2012, OpenStack'
|
||||
project = u'python-troveclient'
|
||||
copyright = u'2012, OpenStack Foundation'
|
||||
|
||||
version = '1.0'
|
||||
release = '1.0'
|
||||
exclude_trees = []
|
||||
|
||||
pygments_style = 'sphinx'
|
||||
|
||||
html_theme = 'default'
|
||||
html_static_path = ['_static']
|
||||
htmlhelp_basename = 'python-reddwarfclientdoc'
|
||||
htmlhelp_basename = 'python-troveclientdoc'
|
||||
latex_documents = [
|
||||
('index', 'python-reddwarfclient.tex', u'python-reddwarfclient Documentation',
|
||||
u'OpenStack', 'manual'),
|
||||
('index', 'python-troveclient.tex', u'python-troveclient Documentation',
|
||||
u'OpenStack', 'manual'),
|
||||
]
|
||||
|
||||
|
||||
6
requirements.txt
Normal file
6
requirements.txt
Normal file
@ -0,0 +1,6 @@
|
||||
d2to1>=0.2.10,<0.3
|
||||
pbr>=0.5.16,<0.6
|
||||
argparse>=1.2.1
|
||||
httplib2>=0.7.7
|
||||
lxml>=3.0.1
|
||||
prettytable>=0.6,<0.8
|
||||
31
setup.cfg
Normal file
31
setup.cfg
Normal file
@ -0,0 +1,31 @@
|
||||
[metadata]
|
||||
name = python-troveclient
|
||||
summary = Client library for OpenStack DBaaS API
|
||||
description-file =
|
||||
README.rst
|
||||
author = OpenStack
|
||||
author-email = openstack-dev@lists.openstack.org
|
||||
home-page = http://www.openstack.org/
|
||||
classifier =
|
||||
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
|
||||
Programming Language :: Python :: 2.6
|
||||
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
reddwarf-cli = reddwarfclient.cli:main
|
||||
reddwarf-mgmt-cli = reddwarfclient.mcli:main
|
||||
|
||||
[files]
|
||||
packages =
|
||||
reddwarfclient
|
||||
|
||||
[global]
|
||||
setup-hooks =
|
||||
pbr.hooks.setup_hook
|
||||
105
setup.py
Normal file → Executable file
105
setup.py
Normal file → Executable file
@ -1,92 +1,21 @@
|
||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
#!/usr/bin/env python
|
||||
# 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
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Copyright 2010 United States Government as represented by the
|
||||
# Administrator of the National Aeronautics and Space Administration.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# 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
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import os
|
||||
import re
|
||||
import setuptools
|
||||
import sys
|
||||
|
||||
|
||||
# Get requirements from the first file that exists
|
||||
def get_reqs_from_files(requirements_files):
|
||||
for requirements_file in requirements_files:
|
||||
if os.path.exists(requirements_file):
|
||||
with open(requirements_file, 'r') as fil:
|
||||
return fil.read().split('\n')
|
||||
return []
|
||||
|
||||
|
||||
def parse_requirements(requirements_files=['requirements.txt',
|
||||
'tools/pip-requires']):
|
||||
requirements = []
|
||||
for line in get_reqs_from_files(requirements_files):
|
||||
# For the requirements list, we need to inject only the portion
|
||||
# after egg= so that distutils knows the package it's looking for
|
||||
# such as:
|
||||
# -e git://github.com/openstack/nova/master#egg=nova
|
||||
if re.match(r'\s*-e\s+', line):
|
||||
requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1',
|
||||
line))
|
||||
# such as:
|
||||
# http://github.com/openstack/nova/zipball/master#egg=nova
|
||||
elif re.match(r'\s*https?:', line):
|
||||
requirements.append(re.sub(r'\s*https?:.*#egg=(.*)$', r'\1',
|
||||
line))
|
||||
# -f lines are for index locations, and don't get used here
|
||||
elif re.match(r'\s*-f\s+', line):
|
||||
pass
|
||||
# argparse is part of the standard library starting with 2.7
|
||||
# adding it to the requirements list screws distro installs
|
||||
elif line == 'argparse' and sys.version_info >= (2, 7):
|
||||
pass
|
||||
else:
|
||||
requirements.append(line)
|
||||
|
||||
return requirements
|
||||
|
||||
|
||||
def read_file(file_name):
|
||||
return open(os.path.join(os.path.dirname(__file__), file_name)).read()
|
||||
|
||||
|
||||
setuptools.setup(
|
||||
name="python-troveclient",
|
||||
version="0.1.2",
|
||||
author="OpenStack",
|
||||
description="Rich client bindings for Trove REST API.",
|
||||
long_description="""Rich client bindings for Trove REST API.""",
|
||||
license="Apache License, Version 2.0",
|
||||
url="https://openstack.org",
|
||||
packages=["reddwarfclient"],
|
||||
install_requires=parse_requirements(),
|
||||
test_suite="nose.collector",
|
||||
classifiers=[
|
||||
"Development Status :: 5 - Production/Stable",
|
||||
"Environment :: Console",
|
||||
"Intended Audience :: Developers",
|
||||
"Intended Audience :: Information Technology",
|
||||
"License :: OSI Approved :: Apache Software License",
|
||||
"Operating System :: OS Independent",
|
||||
"Programming Language :: Python"
|
||||
],
|
||||
entry_points={
|
||||
"console_scripts": ["reddwarf-cli = reddwarfclient.cli:main",
|
||||
"reddwarf-mgmt-cli = reddwarfclient.mcli:main",
|
||||
]
|
||||
}
|
||||
)
|
||||
setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
|
||||
d2to1=True)
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
argparse>=1.2.1
|
||||
httplib2>=0.7.7
|
||||
lxml>=3.0.1
|
||||
prettytable>=0.6.1
|
||||
6
tox.ini
6
tox.ini
@ -1,4 +1,4 @@
|
||||
# Python Reddwarf Client
|
||||
# Python Trove Client
|
||||
|
||||
[tox]
|
||||
envlist = py26,py27,pep8
|
||||
@ -10,8 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
|
||||
NOSE_OPENSTACK_RED=0.05
|
||||
NOSE_OPENSTACK_YELLOW=0.025
|
||||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||
deps = -r{toxinidir}/tools/pip-requires
|
||||
-r{toxinidir}/tools/test-requires
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = nosetests
|
||||
|
||||
[testenv:pep8]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user