From 57e352a070665f3dbc2a90d53c34521178669836 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 29 Feb 2012 14:14:14 -0800 Subject: [PATCH] All the latest OpenStack hotness. --- .gitignore | 3 +- AUTHORS | 1 + glanceclient/openstack/__init__.py | 0 glanceclient/openstack/common/__init__.py | 0 glanceclient/openstack/common/setup.py | 127 ++++++++++++++++++++++ openstack-common.conf | 7 ++ run_tests.sh | 2 +- setup.cfg | 7 ++ setup.py | 20 ++-- tools/pip-requires | 4 + tools/test-requires | 9 ++ tox.ini | 39 ++++++- 12 files changed, 203 insertions(+), 16 deletions(-) create mode 100644 glanceclient/openstack/__init__.py create mode 100644 glanceclient/openstack/common/__init__.py create mode 100644 glanceclient/openstack/common/setup.py create mode 100644 openstack-common.conf create mode 100644 tools/pip-requires create mode 100644 tools/test-requires diff --git a/.gitignore b/.gitignore index 097d2085..811f856c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ cover *~ build dist -python_keystoneclient.egg-info +python_glanceclient.egg-info +ChangeLog diff --git a/AUTHORS b/AUTHORS index dcd8dc7f..a87ebddb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,2 @@ Jay Pipes +Monty Taylor diff --git a/glanceclient/openstack/__init__.py b/glanceclient/openstack/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/glanceclient/openstack/common/__init__.py b/glanceclient/openstack/common/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/glanceclient/openstack/common/setup.py b/glanceclient/openstack/common/setup.py new file mode 100644 index 00000000..9eabfcca --- /dev/null +++ b/glanceclient/openstack/common/setup.py @@ -0,0 +1,127 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# 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 os +import re +import subprocess + + +def parse_mailmap(mailmap='.mailmap'): + mapping = {} + if os.path.exists(mailmap): + fp = open(mailmap, 'r') + for l in fp: + l = l.strip() + if not l.startswith('#') and ' ' in l: + canonical_email, alias = l.split(' ') + mapping[alias] = canonical_email + return mapping + + +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 in mapping.iteritems(): + changelog = changelog.replace(alias, email) + return changelog + + +# Get requirements from the first file that exists +def get_reqs_from_files(requirements_files): + reqs_in = [] + for requirements_file in requirements_files: + if os.path.exists(requirements_file): + return open(requirements_file, 'r').read().split('\n') + return [] + + +def parse_requirements(requirements_files=['requirements.txt', + 'tools/pip-requires']): + requirements = [] + for line in get_reqs_from_files(requirements_files): + if re.match(r'\s*-e\s+', line): + requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1', + line)) + elif re.match(r'\s*-f\s+', line): + pass + else: + requirements.append(line) + + return requirements + + +def parse_dependency_links(requirements_files=['requirements.txt', + 'tools/pip-requires']): + dependency_links = [] + for line in get_reqs_from_files(requirements_files): + if re.match(r'(\s*#)|(\s*$)', line): + continue + if re.match(r'\s*-[ef]\s+', line): + dependency_links.append(re.sub(r'\s*-[ef]\s+', '', line)) + return dependency_links + + +def write_requirements(): + venv = os.environ.get('VIRTUAL_ENV', None) + if venv is not None: + with open("requirements.txt", "w") as req_file: + output = subprocess.Popen(["pip", "-E", venv, "freeze", "-l"], + stdout=subprocess.PIPE) + requirements = output.communicate()[0].strip() + req_file.write(requirements) + + +def _run_shell_command(cmd): + output = subprocess.Popen(["/bin/sh", "-c", cmd], + stdout=subprocess.PIPE) + return output.communicate()[0].strip() + + +def write_vcsversion(location): + """ Produce a vcsversion dict that mimics the old one produced by bzr + """ + if os.path.isdir('.git'): + branch_nick_cmd = 'git branch | grep -Ei "\* (.*)" | cut -f2 -d" "' + branch_nick = _run_shell_command(branch_nick_cmd) + revid_cmd = "git rev-parse HEAD" + revid = _run_shell_command(revid_cmd).split()[0] + revno_cmd = "git log --oneline | wc -l" + revno = _run_shell_command(revno_cmd) + with open(location, 'w') as version_file: + version_file.write(""" +# This file is automatically generated by setup.py, So don't edit it. :) +version_info = { + 'branch_nick': '%s', + 'revision_id': '%s', + 'revno': %s +} +""" % (branch_nick, revid, revno)) + + +def write_git_changelog(): + """ Write a changelog based on the git changelog """ + if os.path.isdir('.git'): + git_log_cmd = 'git log --stat' + changelog = _run_shell_command(git_log_cmd) + mailmap = parse_mailmap() + with open("ChangeLog", "w") as changelog_file: + changelog_file.write(canonicalize_emails(changelog, mailmap)) diff --git a/openstack-common.conf b/openstack-common.conf new file mode 100644 index 00000000..b97be2b7 --- /dev/null +++ b/openstack-common.conf @@ -0,0 +1,7 @@ +[DEFAULT] + +# The list of modules to copy from openstack-common +modules=setup + +# The base module to hold the copy of openstack.common +base=glanceclient diff --git a/run_tests.sh b/run_tests.sh index 4cd3e3fc..731d2985 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -4,7 +4,7 @@ set -eu function usage { echo "Usage: $0 [OPTION]..." - echo "Run python-keystoneclient test suite" + echo "Run python-glanceclient test suite" echo "" echo " -V, --virtual-env Always use virtualenv. Install automatically if not present" echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment" diff --git a/setup.cfg b/setup.cfg index ab2a9497..3ef59d00 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,6 +3,13 @@ cover-package = glanceclient cover-html = true cover-erase = true cover-inclusive = true +verbosity=2 +detailed-errors=1 +with-openstack=1 +openstack-red=0.05 +openstack-yellow=0.025 +openstack-show-elapsed=1 +openstack-color=1 [build_sphinx] source-dir = docs/ diff --git a/setup.py b/setup.py index 098d2d91..f989680b 100644 --- a/setup.py +++ b/setup.py @@ -2,16 +2,20 @@ import os import sys from setuptools import setup, find_packages +from glanceclient.openstack.common.setup import parse_requirements +from glanceclient.openstack.common.setup import parse_dependency_links +from glanceclient.openstack.common.setup import write_requirements +from glanceclient.openstack.common.setup import write_git_changelog + +requires = parse_requirements() +depend_links = parse_dependency_links() +write_requirements() +write_git_changelog() + def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -requirements = ['httplib2', 'prettytable'] -if sys.version_info < (2, 6): - requirements.append('simplejson') -if sys.version_info < (2, 7): - requirements.append('argparse') - setup( name = "python-glanceclient", version = "2012.1", @@ -31,9 +35,9 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', ], - install_requires = requirements, + install_requires=requires, + dependency_links=depend_links, - tests_require = ["nose", "mock", "mox"], test_suite = "nose.collector", entry_points = { diff --git a/tools/pip-requires b/tools/pip-requires new file mode 100644 index 00000000..32cdbc0b --- /dev/null +++ b/tools/pip-requires @@ -0,0 +1,4 @@ +argparse +httplib2 +prettytable +simplejson diff --git a/tools/test-requires b/tools/test-requires new file mode 100644 index 00000000..7c320d42 --- /dev/null +++ b/tools/test-requires @@ -0,0 +1,9 @@ +distribute>=0.6.24 + +coverage +mock>=0.7.1 +mox +nose +nosexcover +openstack.nose_plugin +pep8==0.6.1 diff --git a/tox.ini b/tox.ini index c81dd64d..fb641484 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,41 @@ [tox] -envlist = py26,py27 +envlist = py26,py27,pep8 [testenv] +setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/tools/pip-requires -commands = /bin/bash run_tests.sh -N + -r{toxinidir}/tools/test-requires +commands = nosetests [testenv:pep8] deps = pep8 -commands = /bin/bash run_tests.sh -N --pep8 +commands = pep8 --repeat --show-source glanceclient setup.py -[testenv:coverage] -deps = pep8 -commands = /bin/bash run_tests.sh -N --with-coverage +[testenv:venv] +commands = {posargs} + +[testenv:cover] +commands = nosetests --with-coverage --cover-html --cover-erase --cover-package=glanceclient + +[testenv:hudson] +downloadcache = ~/cache/pip + +[testenv:jenkins26] +basepython = python2.6 +deps = file://{toxinidir}/.cache.bundle + +[testenv:jenkins27] +basepython = python2.7 +deps = file://{toxinidir}/.cache.bundle + +[testenv:jenkinspep8] +deps = file://{toxinidir}/.cache.bundle +commands = pep8 --repeat --show-source glanceclient setup.py + +[testenv:jenkinscover] +deps = file://{toxinidir}/.cache.bundle +commands = nosetests --cover-erase --cover-package=glanceclient --with-xcoverage + +[testenv:jenkinsvenv] +deps = file://{toxinidir}/.cache.bundle +commands = {posargs}