Cherry-pick following change-ids from release-0.2.
I155d42b0b45444fe239cb4ac9bd7e26e5c835aa5 Ie8559212b3850a191e61b7eace489ac369f7bfab I42d3f577270c8330595c1e006e488c6fc4567d12 Ic75310c28e3d65e8871cc974699146c6767a4c6b Ibf5ded656f7ae2c80e00aeb4c757bf238b7595aa Change-Id: Ic260349de80e4ab92239c8eef8e492507bbc40e9
This commit is contained in:
parent
16a310480f
commit
59920a3d63
|
@ -117,3 +117,16 @@ def exit(msg=''):
|
||||||
if msg:
|
if msg:
|
||||||
print >> sys.stderr, msg
|
print >> sys.stderr, msg
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
|
def getsockopt(self, *args, **kwargs):
|
||||||
|
"""
|
||||||
|
A function which allows us to monkey patch eventlet's
|
||||||
|
GreenSocket, adding a required 'getsockopt' method.
|
||||||
|
TODO: (mclaren) we can remove this once the eventlet fix
|
||||||
|
(https://bitbucket.org/eventlet/eventlet/commits/609f230)
|
||||||
|
lands in mainstream packages.
|
||||||
|
NOTE: Already in 0.13, but we can't be sure that all clients
|
||||||
|
that use python-muranoclient also use newest eventlet
|
||||||
|
"""
|
||||||
|
return self.fd.getsockopt(*args, **kwargs)
|
||||||
|
|
|
@ -1,359 +0,0 @@
|
||||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
||||||
|
|
||||||
# Copyright 2011 OpenStack LLC.
|
|
||||||
# Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
|
|
||||||
# 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.
|
|
||||||
|
|
||||||
"""
|
|
||||||
Utilities with minimum-depends for use in setup.py
|
|
||||||
"""
|
|
||||||
|
|
||||||
import email
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from setuptools.command import sdist
|
|
||||||
|
|
||||||
|
|
||||||
def parse_mailmap(mailmap='.mailmap'):
|
|
||||||
mapping = {}
|
|
||||||
if os.path.exists(mailmap):
|
|
||||||
with open(mailmap, 'r') as fp:
|
|
||||||
for l in fp:
|
|
||||||
try:
|
|
||||||
canonical_email, alias = re.match(
|
|
||||||
r'[^#]*?(<.+>).*(<.+>).*', l).groups()
|
|
||||||
except AttributeError:
|
|
||||||
continue
|
|
||||||
mapping[alias] = canonical_email
|
|
||||||
return mapping
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_git_mailmap(git_dir, mailmap='.mailmap'):
|
|
||||||
mailmap = os.path.join(os.path.dirname(git_dir), mailmap)
|
|
||||||
return parse_mailmap(mailmap)
|
|
||||||
|
|
||||||
|
|
||||||
def canonicalize_emails(changelog, mapping):
|
|
||||||
"""Takes in a string and an email alias mapping and replaces all
|
|
||||||
instances of the aliases in the string with their real email.
|
|
||||||
"""
|
|
||||||
for alias, email_address in mapping.iteritems():
|
|
||||||
changelog = changelog.replace(alias, email_address)
|
|
||||||
return changelog
|
|
||||||
|
|
||||||
|
|
||||||
# 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 parse_dependency_links(requirements_files=['requirements.txt',
|
|
||||||
'tools/pip-requires']):
|
|
||||||
dependency_links = []
|
|
||||||
# dependency_links inject alternate locations to find packages listed
|
|
||||||
# in requirements
|
|
||||||
for line in get_reqs_from_files(requirements_files):
|
|
||||||
# skip comments and blank lines
|
|
||||||
if re.match(r'(\s*#)|(\s*$)', line):
|
|
||||||
continue
|
|
||||||
# lines with -e or -f need the whole line, minus the flag
|
|
||||||
if re.match(r'\s*-[ef]\s+', line):
|
|
||||||
dependency_links.append(re.sub(r'\s*-[ef]\s+', '', line))
|
|
||||||
# lines that are only urls can go in unmolested
|
|
||||||
elif re.match(r'\s*https?:', line):
|
|
||||||
dependency_links.append(line)
|
|
||||||
return dependency_links
|
|
||||||
|
|
||||||
|
|
||||||
def _run_shell_command(cmd, throw_on_error=False):
|
|
||||||
if os.name == 'nt':
|
|
||||||
output = subprocess.Popen(["cmd.exe", "/C", cmd],
|
|
||||||
stdout=subprocess.PIPE,
|
|
||||||
stderr=subprocess.PIPE)
|
|
||||||
else:
|
|
||||||
output = subprocess.Popen(["/bin/sh", "-c", cmd],
|
|
||||||
stdout=subprocess.PIPE,
|
|
||||||
stderr=subprocess.PIPE)
|
|
||||||
out = output.communicate()
|
|
||||||
if output.returncode and throw_on_error:
|
|
||||||
raise Exception("%s returned %d" % cmd, output.returncode)
|
|
||||||
if len(out) == 0:
|
|
||||||
return None
|
|
||||||
if len(out[0].strip()) == 0:
|
|
||||||
return None
|
|
||||||
return out[0].strip()
|
|
||||||
|
|
||||||
|
|
||||||
def _get_git_directory():
|
|
||||||
parent_dir = os.path.dirname(__file__)
|
|
||||||
while True:
|
|
||||||
git_dir = os.path.join(parent_dir, '.git')
|
|
||||||
if os.path.exists(git_dir):
|
|
||||||
return git_dir
|
|
||||||
parent_dir, child = os.path.split(parent_dir)
|
|
||||||
if not child: # reached to root dir
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def write_git_changelog():
|
|
||||||
"""Write a changelog based on the git changelog."""
|
|
||||||
new_changelog = 'ChangeLog'
|
|
||||||
git_dir = _get_git_directory()
|
|
||||||
if not os.getenv('SKIP_WRITE_GIT_CHANGELOG'):
|
|
||||||
if git_dir:
|
|
||||||
git_log_cmd = 'git --git-dir=%s log --stat' % git_dir
|
|
||||||
changelog = _run_shell_command(git_log_cmd)
|
|
||||||
mailmap = _parse_git_mailmap(git_dir)
|
|
||||||
with open(new_changelog, "w") as changelog_file:
|
|
||||||
changelog_file.write(canonicalize_emails(changelog, mailmap))
|
|
||||||
else:
|
|
||||||
open(new_changelog, 'w').close()
|
|
||||||
|
|
||||||
|
|
||||||
def generate_authors():
|
|
||||||
"""Create AUTHORS file using git commits."""
|
|
||||||
jenkins_email = 'jenkins@review.(openstack|stackforge).org'
|
|
||||||
old_authors = 'AUTHORS.in'
|
|
||||||
new_authors = 'AUTHORS'
|
|
||||||
git_dir = _get_git_directory()
|
|
||||||
if not os.getenv('SKIP_GENERATE_AUTHORS'):
|
|
||||||
if git_dir:
|
|
||||||
# don't include jenkins email address in AUTHORS file
|
|
||||||
git_log_cmd = ("git --git-dir=" + git_dir +
|
|
||||||
" log --format='%aN <%aE>' | sort -u | "
|
|
||||||
"egrep -v '" + jenkins_email + "'")
|
|
||||||
changelog = _run_shell_command(git_log_cmd)
|
|
||||||
mailmap = _parse_git_mailmap(git_dir)
|
|
||||||
with open(new_authors, 'w') as new_authors_fh:
|
|
||||||
new_authors_fh.write(canonicalize_emails(changelog, mailmap))
|
|
||||||
if os.path.exists(old_authors):
|
|
||||||
with open(old_authors, "r") as old_authors_fh:
|
|
||||||
new_authors_fh.write('\n' + old_authors_fh.read())
|
|
||||||
else:
|
|
||||||
open(new_authors, 'w').close()
|
|
||||||
|
|
||||||
|
|
||||||
_rst_template = """%(heading)s
|
|
||||||
%(underline)s
|
|
||||||
|
|
||||||
.. automodule:: %(module)s
|
|
||||||
:members:
|
|
||||||
:undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
def get_cmdclass():
|
|
||||||
"""Return dict of commands to run from setup.py."""
|
|
||||||
|
|
||||||
cmdclass = dict()
|
|
||||||
|
|
||||||
def _find_modules(arg, dirname, files):
|
|
||||||
for filename in files:
|
|
||||||
if filename.endswith('.py') and filename != '__init__.py':
|
|
||||||
arg["%s.%s" % (dirname.replace('/', '.'),
|
|
||||||
filename[:-3])] = True
|
|
||||||
|
|
||||||
class LocalSDist(sdist.sdist):
|
|
||||||
"""Builds the ChangeLog and Authors files from VC first."""
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
write_git_changelog()
|
|
||||||
generate_authors()
|
|
||||||
# sdist.sdist is an old style class, can't use super()
|
|
||||||
sdist.sdist.run(self)
|
|
||||||
|
|
||||||
cmdclass['sdist'] = LocalSDist
|
|
||||||
|
|
||||||
# If Sphinx is installed on the box running setup.py,
|
|
||||||
# enable setup.py to build the documentation, otherwise,
|
|
||||||
# just ignore it
|
|
||||||
try:
|
|
||||||
from sphinx.setup_command import BuildDoc
|
|
||||||
|
|
||||||
class LocalBuildDoc(BuildDoc):
|
|
||||||
|
|
||||||
builders = ['html', 'man']
|
|
||||||
|
|
||||||
def generate_autoindex(self):
|
|
||||||
print "**Autodocumenting from %s" % os.path.abspath(os.curdir)
|
|
||||||
modules = {}
|
|
||||||
option_dict = self.distribution.get_option_dict('build_sphinx')
|
|
||||||
source_dir = os.path.join(option_dict['source_dir'][1], 'api')
|
|
||||||
if not os.path.exists(source_dir):
|
|
||||||
os.makedirs(source_dir)
|
|
||||||
for pkg in self.distribution.packages:
|
|
||||||
if '.' not in pkg:
|
|
||||||
os.path.walk(pkg, _find_modules, modules)
|
|
||||||
module_list = modules.keys()
|
|
||||||
module_list.sort()
|
|
||||||
autoindex_filename = os.path.join(source_dir, 'autoindex.rst')
|
|
||||||
with open(autoindex_filename, 'w') as autoindex:
|
|
||||||
autoindex.write(""".. toctree::
|
|
||||||
:maxdepth: 1
|
|
||||||
|
|
||||||
""")
|
|
||||||
for module in module_list:
|
|
||||||
output_filename = os.path.join(source_dir,
|
|
||||||
"%s.rst" % module)
|
|
||||||
heading = "The :mod:`%s` Module" % module
|
|
||||||
underline = "=" * len(heading)
|
|
||||||
values = dict(module=module, heading=heading,
|
|
||||||
underline=underline)
|
|
||||||
|
|
||||||
print "Generating %s" % output_filename
|
|
||||||
with open(output_filename, 'w') as output_file:
|
|
||||||
output_file.write(_rst_template % values)
|
|
||||||
autoindex.write(" %s.rst\n" % module)
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
if not os.getenv('SPHINX_DEBUG'):
|
|
||||||
self.generate_autoindex()
|
|
||||||
|
|
||||||
for builder in self.builders:
|
|
||||||
self.builder = builder
|
|
||||||
self.finalize_options()
|
|
||||||
self.project = self.distribution.get_name()
|
|
||||||
self.version = self.distribution.get_version()
|
|
||||||
self.release = self.distribution.get_version()
|
|
||||||
BuildDoc.run(self)
|
|
||||||
|
|
||||||
class LocalBuildLatex(LocalBuildDoc):
|
|
||||||
builders = ['latex']
|
|
||||||
|
|
||||||
cmdclass['build_sphinx'] = LocalBuildDoc
|
|
||||||
cmdclass['build_sphinx_latex'] = LocalBuildLatex
|
|
||||||
except ImportError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return cmdclass
|
|
||||||
|
|
||||||
|
|
||||||
def _get_revno(git_dir):
|
|
||||||
"""Return the number of commits since the most recent tag.
|
|
||||||
|
|
||||||
We use git-describe to find this out, but if there are no
|
|
||||||
tags then we fall back to counting commits since the beginning
|
|
||||||
of time.
|
|
||||||
"""
|
|
||||||
describe = _run_shell_command(
|
|
||||||
"git --git-dir=%s describe --always" % git_dir)
|
|
||||||
if "-" in describe:
|
|
||||||
return describe.rsplit("-", 2)[-2]
|
|
||||||
|
|
||||||
# no tags found
|
|
||||||
revlist = _run_shell_command(
|
|
||||||
"git --git-dir=%s rev-list --abbrev-commit HEAD" % git_dir)
|
|
||||||
return len(revlist.splitlines())
|
|
||||||
|
|
||||||
|
|
||||||
def _get_version_from_git(pre_version):
|
|
||||||
"""Return a version which is equal to the tag that's on the current
|
|
||||||
revision if there is one, or tag plus number of additional revisions
|
|
||||||
if the current revision has no tag."""
|
|
||||||
|
|
||||||
git_dir = _get_git_directory()
|
|
||||||
if git_dir:
|
|
||||||
if pre_version:
|
|
||||||
try:
|
|
||||||
return _run_shell_command(
|
|
||||||
"git --git-dir=" + git_dir + " describe --exact-match",
|
|
||||||
throw_on_error=True).replace('-', '.')
|
|
||||||
except Exception:
|
|
||||||
sha = _run_shell_command(
|
|
||||||
"git --git-dir=" + git_dir + " log -n1 --pretty=format:%h")
|
|
||||||
return "%s.a%s.g%s" % (pre_version, _get_revno(git_dir), sha)
|
|
||||||
else:
|
|
||||||
return _run_shell_command(
|
|
||||||
"git --git-dir=" + git_dir + " describe --always").replace(
|
|
||||||
'-', '.')
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _get_version_from_pkg_info(package_name):
|
|
||||||
"""Get the version from PKG-INFO file if we can."""
|
|
||||||
try:
|
|
||||||
pkg_info_file = open('PKG-INFO', 'r')
|
|
||||||
except (IOError, OSError):
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
pkg_info = email.message_from_file(pkg_info_file)
|
|
||||||
except email.MessageError:
|
|
||||||
return None
|
|
||||||
# Check to make sure we're in our own dir
|
|
||||||
if pkg_info.get('Name', None) != package_name:
|
|
||||||
return None
|
|
||||||
return pkg_info.get('Version', None)
|
|
||||||
|
|
||||||
|
|
||||||
def get_version(package_name, pre_version=None):
|
|
||||||
"""Get the version of the project. First, try getting it from PKG-INFO, if
|
|
||||||
it exists. If it does, that means we're in a distribution tarball or that
|
|
||||||
install has happened. Otherwise, if there is no PKG-INFO file, pull the
|
|
||||||
version from git.
|
|
||||||
|
|
||||||
We do not support setup.py version sanity in git archive tarballs, nor do
|
|
||||||
we support packagers directly sucking our git repo into theirs. We expect
|
|
||||||
that a source tarball be made from our git repo - or that if someone wants
|
|
||||||
to make a source tarball from a fork of our repo with additional tags in it
|
|
||||||
that they understand and desire the results of doing that.
|
|
||||||
"""
|
|
||||||
version = os.environ.get("OSLO_PACKAGE_VERSION", None)
|
|
||||||
if version:
|
|
||||||
return version
|
|
||||||
version = _get_version_from_pkg_info(package_name)
|
|
||||||
if version:
|
|
||||||
return version
|
|
||||||
version = _get_version_from_git(pre_version)
|
|
||||||
if version:
|
|
||||||
return version
|
|
||||||
raise Exception("Versioning for this project requires either an sdist"
|
|
||||||
" tarball, or access to an upstream git repository.")
|
|
|
@ -1,94 +0,0 @@
|
||||||
|
|
||||||
# Copyright 2012 OpenStack LLC
|
|
||||||
# Copyright 2012-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.
|
|
||||||
|
|
||||||
"""
|
|
||||||
Utilities for consuming the version from pkg_resources.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import pkg_resources
|
|
||||||
|
|
||||||
|
|
||||||
class VersionInfo(object):
|
|
||||||
|
|
||||||
def __init__(self, package):
|
|
||||||
"""Object that understands versioning for a package
|
|
||||||
:param package: name of the python package, such as glance, or
|
|
||||||
python-glanceclient
|
|
||||||
"""
|
|
||||||
self.package = package
|
|
||||||
self.release = None
|
|
||||||
self.version = None
|
|
||||||
self._cached_version = None
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
"""Make the VersionInfo object behave like a string."""
|
|
||||||
return self.version_string()
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
"""Include the name."""
|
|
||||||
return "VersionInfo(%s:%s)" % (self.package, self.version_string())
|
|
||||||
|
|
||||||
def _get_version_from_pkg_resources(self):
|
|
||||||
"""Get the version of the package from the pkg_resources record
|
|
||||||
associated with the package."""
|
|
||||||
try:
|
|
||||||
requirement = pkg_resources.Requirement.parse(self.package)
|
|
||||||
provider = pkg_resources.get_provider(requirement)
|
|
||||||
return provider.version
|
|
||||||
except pkg_resources.DistributionNotFound:
|
|
||||||
# The most likely cause for this is running tests in a tree
|
|
||||||
# produced from a tarball where the package itself has not been
|
|
||||||
# installed into anything. Revert to setup-time logic.
|
|
||||||
from muranoclient.openstack.common import setup
|
|
||||||
return setup.get_version(self.package)
|
|
||||||
|
|
||||||
def release_string(self):
|
|
||||||
"""Return the full version of the package including suffixes indicating
|
|
||||||
VCS status.
|
|
||||||
"""
|
|
||||||
if self.release is None:
|
|
||||||
self.release = self._get_version_from_pkg_resources()
|
|
||||||
|
|
||||||
return self.release
|
|
||||||
|
|
||||||
def version_string(self):
|
|
||||||
"""Return the short version minus any alpha/beta tags."""
|
|
||||||
if self.version is None:
|
|
||||||
parts = []
|
|
||||||
for part in self.release_string().split('.'):
|
|
||||||
if part[0].isdigit():
|
|
||||||
parts.append(part)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
self.version = ".".join(parts)
|
|
||||||
|
|
||||||
return self.version
|
|
||||||
|
|
||||||
# Compatibility functions
|
|
||||||
canonical_version_string = version_string
|
|
||||||
version_string_with_vcs = release_string
|
|
||||||
|
|
||||||
def cached_version_string(self, prefix=""):
|
|
||||||
"""Generate an object which will expand in a string context to
|
|
||||||
the results of version_string(). We do this so that don't
|
|
||||||
call into pkg_resources every time we start up a program when
|
|
||||||
passing version information into the CONF constructor, but
|
|
||||||
rather only do the calculation when and if a version is requested
|
|
||||||
"""
|
|
||||||
if not self._cached_version:
|
|
||||||
self._cached_version = "%s%s" % (prefix,
|
|
||||||
self.version_string())
|
|
||||||
return self._cached_version
|
|
|
@ -11,6 +11,7 @@
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
import types
|
||||||
|
|
||||||
import posixpath
|
import posixpath
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
|
@ -63,9 +64,14 @@ class ServiceManager(base.Manager):
|
||||||
def post(self, environment_id, path, data, session_id):
|
def post(self, environment_id, path, data, session_id):
|
||||||
headers = {'X-Configuration-Session': session_id}
|
headers = {'X-Configuration-Session': session_id}
|
||||||
|
|
||||||
return self._create('/environments/{0}/services/{1}'.
|
result = self._create('/environments/{0}/services/{1}'.
|
||||||
format(environment_id, path), data,
|
format(environment_id, path), data,
|
||||||
headers=headers)
|
headers=headers, return_raw=True)
|
||||||
|
|
||||||
|
if isinstance(result, types.ListType):
|
||||||
|
return [self.resource_class(self, item) for item in result]
|
||||||
|
else:
|
||||||
|
return self.resource_class(self, result)
|
||||||
|
|
||||||
@normalize_path
|
@normalize_path
|
||||||
def put(self, environment_id, path, data, session_id):
|
def put(self, environment_id, path, data, session_id):
|
||||||
|
|
|
@ -13,6 +13,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
from muranoclient.openstack.common import version as common_version
|
from pbr import version
|
||||||
|
|
||||||
version_info = common_version.VersionInfo('python-muranoclient')
|
version_info = version.VersionInfo('python-muranoclient')
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
|
||||||
# The list of modules to copy from openstack-common
|
# The list of modules to copy from openstack-common
|
||||||
modules=setup,importutils,version,strutils,gettextutils
|
modules=importutils,strutils,gettextutils
|
||||||
|
|
||||||
# The base module to hold the copy of openstack.common
|
# The base module to hold the copy of openstack.common
|
||||||
base=muranoclient
|
base=muranoclient
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
d2to1>=0.2.10,<0.3
|
||||||
|
pbr>=0.5,<0.6
|
||||||
argparse
|
argparse
|
||||||
prettytable>=0.6,<0.7
|
prettytable>=0.6,<0.7
|
||||||
python-keystoneclient>=0.1.2
|
python-keystoneclient>=0.1.2
|
|
@ -145,7 +145,7 @@ uninst()
|
||||||
# Uninstall trough pip
|
# Uninstall trough pip
|
||||||
find_pip
|
find_pip
|
||||||
# looking up for python package installed
|
# looking up for python package installed
|
||||||
PYPKG=$SERVICE_SRV_NAME
|
PYPKG="muranoclient"
|
||||||
_pkg=$($PIPCMD freeze | grep $PYPKG)
|
_pkg=$($PIPCMD freeze | grep $PYPKG)
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
log "Removing package \"$PYPKG\" with pip"
|
log "Removing package \"$PYPKG\" with pip"
|
||||||
|
@ -166,7 +166,7 @@ case $COMMAND in
|
||||||
;;
|
;;
|
||||||
|
|
||||||
uninstall )
|
uninstall )
|
||||||
log "Uninstalling \"$SERVICE_SRV_NAME\" from system..."
|
log "Uninstalling muranoclient \"$SERVICE_SRV_NAME\" from system..."
|
||||||
uninst
|
uninst
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
42
setup.cfg
42
setup.cfg
|
@ -1,10 +1,38 @@
|
||||||
[nosetests]
|
[metadata]
|
||||||
cover-package = muranoclient
|
name = python-muranoclient
|
||||||
cover-html = true
|
version = 0.2
|
||||||
cover-erase = true
|
summary = python-muranoclient
|
||||||
cover-inclusive = true
|
description-file =
|
||||||
verbosity=2
|
README.rst
|
||||||
detailed-errors=1
|
license = Apache License, Version 2.0
|
||||||
|
author = Mirantis, Inc.
|
||||||
|
author-email = murano-all@lists.openstack.org
|
||||||
|
home-page = htts://launchpad.net/murano
|
||||||
|
classifier =
|
||||||
|
'Development Status :: 4 - Beta',
|
||||||
|
'Environment :: Console',
|
||||||
|
'Intended Audience :: Developers',
|
||||||
|
'Intended Audience :: Information Technology',
|
||||||
|
'License :: OSI Approved :: Apache Software License',
|
||||||
|
'Operating System :: OS Independent',
|
||||||
|
'Programming Language :: Python'
|
||||||
|
|
||||||
|
[files]
|
||||||
|
packages =
|
||||||
|
muranoclient
|
||||||
|
|
||||||
|
[entry_points]
|
||||||
|
console_scripts =
|
||||||
|
murano = muranoclient.shell:main
|
||||||
|
|
||||||
|
[global]
|
||||||
|
setup-hooks =
|
||||||
|
pbr.hooks.setup_hook
|
||||||
|
|
||||||
|
[egg_info]
|
||||||
|
tag_build =
|
||||||
|
tag_date = 0
|
||||||
|
tag_svn_revision = 0
|
||||||
|
|
||||||
[build_sphinx]
|
[build_sphinx]
|
||||||
source-dir = doc/source
|
source-dir = doc/source
|
||||||
|
|
34
setup.py
34
setup.py
|
@ -14,37 +14,11 @@
|
||||||
|
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
from muranoclient.openstack.common import setup
|
|
||||||
|
|
||||||
project = 'python-muranoclient'
|
|
||||||
|
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
name=project,
|
setup_requires=[
|
||||||
version=setup.get_version(project, '2013.1'),
|
'd2to1>=0.2.10,<0.3',
|
||||||
author='Mirantis, Inc.',
|
'pbr>=0.5,<0.6'
|
||||||
author_email='smelikyan@mirantis.com',
|
|
||||||
description="Client library for Murano Project",
|
|
||||||
license='Apache',
|
|
||||||
url='http://murano.mirantis.com/',
|
|
||||||
packages=setuptools.find_packages(exclude=['tests', 'tests.*']),
|
|
||||||
include_package_data=True,
|
|
||||||
install_requires=setup.parse_requirements(),
|
|
||||||
test_suite="nose.collector",
|
|
||||||
cmdclass=setup.get_cmdclass(),
|
|
||||||
classifiers=[
|
|
||||||
'Development Status :: 4 - Beta',
|
|
||||||
'Environment :: Console',
|
|
||||||
'Intended Audience :: Developers',
|
|
||||||
'Intended Audience :: Information Technology',
|
|
||||||
'License :: OSI Approved :: Apache Software License',
|
|
||||||
'Operating System :: OS Independent',
|
|
||||||
'Programming Language :: Python',
|
|
||||||
],
|
],
|
||||||
entry_points={
|
d2to1=True,
|
||||||
'console_scripts': ['murano = muranoclient.shell:main']
|
|
||||||
},
|
|
||||||
dependency_links=setup.parse_dependency_links(),
|
|
||||||
tests_require=setup.parse_requirements(['tools/test-requires']),
|
|
||||||
setup_requires=['setuptools-git>=0.4'],
|
|
||||||
)
|
)
|
||||||
|
|
4
setup.sh
4
setup.sh
|
@ -134,7 +134,7 @@ uninst()
|
||||||
# Uninstall trough pip
|
# Uninstall trough pip
|
||||||
# looking up for python package installed
|
# looking up for python package installed
|
||||||
#PYPKG=`echo $SERVICE_SRV_NAME | tr -d '-'`
|
#PYPKG=`echo $SERVICE_SRV_NAME | tr -d '-'`
|
||||||
PYPKG=$SERVICE_SRV_NAME
|
PYPKG="muranoclient"
|
||||||
pip freeze | grep $PYPKG
|
pip freeze | grep $PYPKG
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
log "Removing package \"$PYPKG\" with pip"
|
log "Removing package \"$PYPKG\" with pip"
|
||||||
|
@ -155,7 +155,7 @@ case $COMMAND in
|
||||||
;;
|
;;
|
||||||
|
|
||||||
uninstall )
|
uninstall )
|
||||||
log "Uninstalling \"$SERVICE_SRV_NAME\" from system..."
|
log "Uninstalling muranoclient \"$SERVICE_SRV_NAME\" from system..."
|
||||||
uninst
|
uninst
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
|
@ -4,72 +4,75 @@
|
||||||
# Administrator of the National Aeronautics and Space Administration.
|
# Administrator of the National Aeronautics and Space Administration.
|
||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
#
|
#
|
||||||
# Copyright 2010 OpenStack LLC.
|
# Copyright 2010 OpenStack Foundation
|
||||||
# Copyright 2013 IBM Corp.
|
# Copyright 2013 IBM Corp.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
# 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
|
# not use this file except in compliance with the License. You may obtain
|
||||||
# a copy of the License at
|
# a copy of the License at
|
||||||
#
|
#
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
#
|
#
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Installation script for python-muranoclient's development virtualenv
|
Installation script for python-muranoclient's development virtualenv
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import ConfigParser
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
import install_venv_common as install_venv
|
import install_venv_common as install_venv
|
||||||
|
|
||||||
|
|
||||||
def print_help():
|
def print_help(project, venv, root):
|
||||||
help = """
|
help = """
|
||||||
Murano development environment setup is complete.
|
%(project)s development environment setup is complete.
|
||||||
|
|
||||||
Murano development uses virtualenv to track and manage Python dependencies
|
%(project)s development uses virtualenv to track and manage Python
|
||||||
while in development and testing.
|
dependencies while in development and testing.
|
||||||
|
|
||||||
To activate the Murano virtualenv for the extent of your current shell session
|
To activate the %(project)s virtualenv for the extent of your current
|
||||||
you can run:
|
shell session you can run:
|
||||||
|
|
||||||
$ source .venv/bin/activate
|
$ source %(venv)s/bin/activate
|
||||||
|
|
||||||
Or, if you prefer, you can run commands in the virtualenv on a case by case
|
Or, if you prefer, you can run commands in the virtualenv on a case by
|
||||||
basis by running:
|
case basis by running:
|
||||||
|
|
||||||
$ tools/with_venv.sh <your command>
|
$ %(root)s/tools/with_venv.sh <your command>
|
||||||
|
|
||||||
Also, make test will automatically use the virtualenv.
|
|
||||||
"""
|
"""
|
||||||
print help
|
print help % dict(project=project, venv=venv, root=root)
|
||||||
|
|
||||||
|
|
||||||
def main(argv):
|
def main(argv):
|
||||||
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||||
|
if os.environ.get('tools_path'):
|
||||||
|
root = os.environ['tools_path']
|
||||||
venv = os.path.join(root, '.venv')
|
venv = os.path.join(root, '.venv')
|
||||||
pip_requires = os.path.join(root, 'tools', 'pip-requires')
|
if os.environ.get('venv'):
|
||||||
test_requires = os.path.join(root, 'tools', 'test-requires')
|
venv = os.environ['venv']
|
||||||
|
pip_requires = os.path.join(root, 'requirements.txt')
|
||||||
|
test_requires = os.path.join(root, 'test-requirements.txt')
|
||||||
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
|
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
|
||||||
project = 'python-muranoclient'
|
setup_cfg = ConfigParser.ConfigParser()
|
||||||
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
|
setup_cfg.read('setup.cfg')
|
||||||
py_version, project)
|
project = setup_cfg.get('metadata', 'name')
|
||||||
|
|
||||||
|
install = install_venv.InstallVenv(
|
||||||
|
root, venv, pip_requires, test_requires, py_version, project)
|
||||||
options = install.parse_args(argv)
|
options = install.parse_args(argv)
|
||||||
install.check_python_version()
|
install.check_python_version()
|
||||||
install.check_dependencies()
|
install.check_dependencies()
|
||||||
install.create_virtualenv(no_site_packages=options.no_site_packages)
|
install.create_virtualenv(no_site_packages=options.no_site_packages)
|
||||||
install.install_dependencies()
|
install.install_dependencies()
|
||||||
install.run_command([os.path.join(venv, 'bin/python'),
|
|
||||||
'setup.py', 'develop'])
|
|
||||||
install.post_process()
|
install.post_process()
|
||||||
print_help()
|
print_help(project, venv, root)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main(sys.argv)
|
main(sys.argv)
|
||||||
|
|
|
@ -29,12 +29,13 @@ import sys
|
||||||
|
|
||||||
class InstallVenv(object):
|
class InstallVenv(object):
|
||||||
|
|
||||||
def __init__(self, root, venv, pip_requires, test_requires, py_version,
|
def __init__(self, root, venv, requirements,
|
||||||
|
test_requirements, py_version,
|
||||||
project):
|
project):
|
||||||
self.root = root
|
self.root = root
|
||||||
self.venv = venv
|
self.venv = venv
|
||||||
self.pip_requires = pip_requires
|
self.requirements = requirements
|
||||||
self.test_requires = test_requires
|
self.test_requirements = test_requirements
|
||||||
self.py_version = py_version
|
self.py_version = py_version
|
||||||
self.project = project
|
self.project = project
|
||||||
|
|
||||||
|
@ -70,11 +71,13 @@ class InstallVenv(object):
|
||||||
def get_distro(self):
|
def get_distro(self):
|
||||||
if (os.path.exists('/etc/fedora-release') or
|
if (os.path.exists('/etc/fedora-release') or
|
||||||
os.path.exists('/etc/redhat-release')):
|
os.path.exists('/etc/redhat-release')):
|
||||||
return Fedora(self.root, self.venv, self.pip_requires,
|
return Fedora(
|
||||||
self.test_requires, self.py_version, self.project)
|
self.root, self.venv, self.requirements,
|
||||||
|
self.test_requirements, self.py_version, self.project)
|
||||||
else:
|
else:
|
||||||
return Distro(self.root, self.venv, self.pip_requires,
|
return Distro(
|
||||||
self.test_requires, self.py_version, self.project)
|
self.root, self.venv, self.requirements,
|
||||||
|
self.test_requirements, self.py_version, self.project)
|
||||||
|
|
||||||
def check_dependencies(self):
|
def check_dependencies(self):
|
||||||
self.get_distro().install_virtualenv()
|
self.get_distro().install_virtualenv()
|
||||||
|
@ -93,11 +96,6 @@ class InstallVenv(object):
|
||||||
else:
|
else:
|
||||||
self.run_command(['virtualenv', '-q', self.venv])
|
self.run_command(['virtualenv', '-q', self.venv])
|
||||||
print 'done.'
|
print 'done.'
|
||||||
print 'Installing pip in venv...',
|
|
||||||
if not self.run_command(['tools/with_venv.sh', 'easy_install',
|
|
||||||
'pip>1.0']).strip():
|
|
||||||
self.die("Failed to install pip.")
|
|
||||||
print 'done.'
|
|
||||||
else:
|
else:
|
||||||
print "venv already exists..."
|
print "venv already exists..."
|
||||||
pass
|
pass
|
||||||
|
@ -116,15 +114,10 @@ class InstallVenv(object):
|
||||||
# the .venv creation to fail. See:
|
# the .venv creation to fail. See:
|
||||||
# https://bugs.launchpad.net/nova/+bug/1047120
|
# https://bugs.launchpad.net/nova/+bug/1047120
|
||||||
self.pip_install('pip==1.1')
|
self.pip_install('pip==1.1')
|
||||||
self.pip_install('distribute')
|
self.pip_install('setuptools')
|
||||||
|
|
||||||
# Install greenlet by hand - just listing it in the requires file does
|
self.pip_install('-r', self.requirements)
|
||||||
# not
|
self.pip_install('-r', self.test_requirements)
|
||||||
# get it installed in the right order
|
|
||||||
self.pip_install('greenlet')
|
|
||||||
|
|
||||||
self.pip_install('-r', self.pip_requires)
|
|
||||||
self.pip_install('-r', self.test_requires)
|
|
||||||
|
|
||||||
def post_process(self):
|
def post_process(self):
|
||||||
self.get_distro().post_process()
|
self.get_distro().post_process()
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -8,8 +8,8 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
NOSE_OPENSTACK_RED=0.05
|
NOSE_OPENSTACK_RED=0.05
|
||||||
NOSE_OPENSTACK_YELLOW=0.025
|
NOSE_OPENSTACK_YELLOW=0.025
|
||||||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||||
deps = -r{toxinidir}/tools/pip-requires
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/tools/test-requires
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = nosetests
|
commands = nosetests
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
|
|
Loading…
Reference in New Issue