Permalink
Browse files

Merge pull request #1 from emonty/master

Updated support files to latest
  • Loading branch information...
2 parents 972677f + 57e352a commit b5847df3e203ec83126a3cc903bca58093399b89 @jaypipes committed Feb 29, 2012
View
@@ -8,4 +8,5 @@ cover
*~
build
dist
-python_keystoneclient.egg-info
+python_glanceclient.egg-info
+ChangeLog
View
@@ -1 +1,2 @@
Jay Pipes <jaypipes@gmail.com>
+Monty Taylor <mordred@inaugust.com>
No changes.
No changes.
@@ -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))
View
@@ -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
View
@@ -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"
View
@@ -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/
View
@@ -2,16 +2,20 @@
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 @@ def read(fname):
'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 = {
View
@@ -0,0 +1,4 @@
+argparse
+httplib2
+prettytable
+simplejson
View
@@ -0,0 +1,9 @@
+distribute>=0.6.24
+
+coverage
+mock>=0.7.1
+mox
+nose
+nosexcover
+openstack.nose_plugin
+pep8==0.6.1
View
39 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}

0 comments on commit b5847df

Please sign in to comment.