diff options
| -rw-r--r-- | openstack/common/setup.py | 367 | ||||
| -rw-r--r-- | openstack/common/version.py | 94 | ||||
| -rw-r--r-- | setup.cfg | 44 | ||||
| -rw-r--r-- | setup.py | 63 | ||||
| -rw-r--r-- | tests/unit/test_setup.py | 257 | ||||
| -rw-r--r-- | tests/unit/test_version.py | 75 | ||||
| -rw-r--r-- | tools/flakes.py | 24 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
8 files changed, 50 insertions, 876 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py deleted file mode 100644 index 1b3a127..0000000 --- a/openstack/common/setup.py +++ /dev/null @@ -1,367 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2011 OpenStack Foundation. -# 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 -""" - -from __future__ import print_function - -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 not out: - return None - return out[0].strip() or None - - -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' % 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) - signed_cmd = ("git --git-dir=" + git_dir + - " log | grep -i Co-authored-by: | sort -u") - signed_entries = _run_shell_command(signed_cmd) - if signed_entries: - new_entries = "\n".join( - [signed.split(":", 1)[1].strip() - for signed in signed_entries.split("\n") if signed]) - changelog = "\n".join((changelog, new_entries)) - 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.") diff --git a/openstack/common/version.py b/openstack/common/version.py deleted file mode 100644 index a94548f..0000000 --- a/openstack/common/version.py +++ /dev/null @@ -1,94 +0,0 @@ - -# Copyright 2012 OpenStack Foundation -# 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 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 @@ -1,3 +1,47 @@ +[metadata] +name = openstack.common +version = 2013.2 +summary = OpenStack Common Libraries +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 + +[files] +packages = + openstack +namespace_packages = + openstack + +[global] +setup-hooks = + pbr.hooks.setup_hook + +[entry_points] +console_scripts = + oslo-rootwrap = openstack.common.rootwrap.cmd:main + oslo-rpc-zmq-receiver = openstack.common.rpc.zmq_receiver:main + +openstack.common.scheduler.filters = + AvailabilityZoneFilter = openstack.common.scheduler.filters.availability_zone_filter:AvailabilityZoneFilter + CapabilitiesFilter = openstack.common.scheduler.filters.capabilities_filter:CapabilitiesFilter + JsonFilter = openstack.common.scheduler.filters.json_filter:JsonFilter + +openstack.common.tests.fakes.weights = + FakeWeigher1 = tests.unit.fakes:FakeWeigher1 + FakeWeigher2 = tests.unit.fakes:FakeWeigher2 + [nosetests] # NOTE(jkoelker) To run the test suite under nose install the following # coverage http://pypi.python.org/pypi/coverage @@ -1,7 +1,5 @@ -#!/usr/bin/python -# -*- encoding: utf-8 -*- -# Copyright (c) 2012 OpenStack Foundation. -# Copyright (c) 2012-2013 Hewlett-Packard Development Company, L.P. +#!/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. @@ -18,59 +16,6 @@ import setuptools -from openstack.common import setup - -requires = setup.parse_requirements() -depend_links = setup.parse_dependency_links() -package = 'openstack.common' - -filters = [ - "AvailabilityZoneFilter = " - "openstack.common.scheduler.filters." - "availability_zone_filter:AvailabilityZoneFilter", - "CapabilitiesFilter = " - "openstack.common.scheduler.filters." - "capabilities_filter:CapabilitiesFilter", - "JsonFilter = " - "openstack.common.scheduler.filters.json_filter:JsonFilter", -] - -weights = [ - "FakeWeigher1 = tests.unit.fakes:FakeWeigher1", - "FakeWeigher2 = tests.unit.fakes:FakeWeigher2", -] - setuptools.setup( - name=package, - version=setup.get_version(package, '2013.1'), - description="Common components for Openstack", - long_description="Common components for Openstack " - "including paster templates.", - classifiers=[ - 'Development Status :: 4 - Beta', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python :: 2.6', - 'Environment :: No Input/Output (Daemon)', ], - keywords='openstack', - author='OpenStack', - author_email='openstack@lists.launchpad.net', - url='http://www.openstack.org/', - license='Apache Software License', - packages=setuptools.find_packages(exclude=['ez_setup', - 'examples', 'tests']), - include_package_data=True, - cmdclass=setup.get_cmdclass(), - zip_safe=True, - install_requires=requires, - dependency_links=depend_links, - entry_points={ - "openstack.common.scheduler.filters": filters, - "openstack.common.tests.fakes.weights": weights, - "console_scripts": [ - 'oslo-rootwrap = openstack.common.rootwrap.cmd:main', - 'oslo-rpc-zmq-receiver = openstack.common.rpc.zmq_receiver:main', - ] - }, - namespace_packages=['openstack'], -) + setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'], + d2to1=True) diff --git a/tests/unit/test_setup.py b/tests/unit/test_setup.py deleted file mode 100644 index 626d71b..0000000 --- a/tests/unit/test_setup.py +++ /dev/null @@ -1,257 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2011 OpenStack Foundation. -# 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 io -import os -import StringIO -import sys -from tempfile import mkstemp - -import fixtures - -from openstack.common import setup -from tests import utils - - -class DiveDir(fixtures.Fixture): - """Dive into given directory and return back on cleanup. - - :ivar path: The target directory. - """ - - def __init__(self, path): - self.path = path - - def setUp(self): - super(DiveDir, self).setUp() - self.old_path = os.getcwd() - os.chdir(self.path) - self.addCleanup(os.chdir, self.old_path) - - -class EmailTestCase(utils.BaseTestCase): - - def test_str_dict_replace(self): - string = 'Johnnie T. Hozer' - mapping = {'T.': 'The'} - self.assertEqual('Johnnie The Hozer', - setup.canonicalize_emails(string, mapping)) - - -class MailmapTestCase(utils.BaseTestCase): - - def setUp(self): - super(MailmapTestCase, self).setUp() - self.useFixture(fixtures.NestedTempfile()) - (fd, self.mailmap) = mkstemp(prefix='openstack', suffix='.setup') - - def test_mailmap_with_fullname(self): - with open(self.mailmap, 'w') as mm_fh: - mm_fh.write("Foo Bar <email@foo.com> Foo Bar <email@bar.com>\n") - self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, - setup.parse_mailmap(self.mailmap)) - - def test_mailmap_with_firstname(self): - with open(self.mailmap, 'w') as mm_fh: - mm_fh.write("Foo <email@foo.com> Foo <email@bar.com>\n") - self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, - setup.parse_mailmap(self.mailmap)) - - def test_mailmap_with_noname(self): - with open(self.mailmap, 'w') as mm_fh: - mm_fh.write("<email@foo.com> <email@bar.com>\n") - self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, - setup.parse_mailmap(self.mailmap)) - - -class GitLogsTest(utils.BaseTestCase): - - def setUp(self): - super(GitLogsTest, self).setUp() - temp_path = self.useFixture(fixtures.TempDir()).path - self.useFixture(DiveDir(temp_path)) - - @staticmethod - def _root_dir(): - # NOTE(yamahata): get root directory of repository - # NOTE(aababilov): use openstack.common.setup.__file__ - # because openstack/common/setup.py uses this - # variable to find the root. - # Do not use test_setup.__file__ variable because - # openstack package can be installed somewhere and - # its location will differ from tests' one. - import openstack.common.setup - return os.path.dirname(os.path.dirname(os.path.dirname( - openstack.common.setup.__file__))) - - def test_write_git_changelog(self): - root_dir = self._root_dir() - exist_files = [os.path.join(root_dir, f) for f in ".git", ".mailmap"] - self.useFixture(fixtures.MonkeyPatch( - "os.path.exists", - lambda path: os.path.abspath(path) in exist_files)) - self.useFixture(fixtures.FakePopen(lambda _: { - "stdout": StringIO.StringIO("Author: Foo Bar <email@bar.com>\n") - })) - - builtin_open = open - - def _fake_open(name, mode): - if name.endswith('.mailmap'): - # StringIO.StringIO doesn't have __exit__ (at least python 2.6) - return io.BytesIO("Foo Bar <email@foo.com> <email@bar.com>\n") - return builtin_open(name, mode) - self.useFixture(fixtures.MonkeyPatch("__builtin__.open", _fake_open)) - - setup.write_git_changelog() - - with open("ChangeLog", "r") as ch_fh: - self.assertTrue("email@foo.com" in ch_fh.read()) - - def _fake_log_output(self, cmd, mapping): - for (k, v) in mapping.items(): - if cmd.startswith(k): - return v - return "" - - def test_generate_authors(self): - author_old = "Foo Foo <email@foo.com>" - author_new = "Bar Bar <email@bar.com>" - co_author = "Foo Bar <foo@bar.com>" - co_author_by = "Co-authored-by: " + co_author - - root_dir = self._root_dir() - - git_log_cmd = ("git --git-dir=%s log --format" % - os.path.join(root_dir, '.git')) - git_co_log_cmd = ("git --git-dir=%s log" % - os.path.join(root_dir, '.git')) - cmd_map = { - git_log_cmd: author_new, - git_co_log_cmd: co_author_by, - } - - exist_files = [os.path.join(root_dir, ".git"), - os.path.abspath("AUTHORS.in")] - self.useFixture(fixtures.MonkeyPatch( - "os.path.exists", - lambda path: os.path.abspath(path) in exist_files)) - - self.useFixture(fixtures.FakePopen(lambda proc_args: { - "stdout": StringIO.StringIO( - self._fake_log_output(proc_args["args"][2], cmd_map)) - })) - - with open("AUTHORS.in", "w") as auth_fh: - auth_fh.write(author_old) - - setup.generate_authors() - - with open("AUTHORS", "r") as auth_fh: - authors = auth_fh.read() - self.assertTrue(author_old in authors) - self.assertTrue(author_new in authors) - self.assertTrue(co_author in authors) - - -class GetCmdClassTest(utils.BaseTestCase): - - def test_get_cmdclass(self): - cmdclass = setup.get_cmdclass() - - self.assertTrue("sdist" in cmdclass) - build_sphinx = cmdclass.get("build_sphinx") - if build_sphinx: - self.useFixture(fixtures.MonkeyPatch( - "sphinx.setup_command.BuildDoc.run", lambda self: None)) - from distutils.dist import Distribution - distr = Distribution() - distr.packages = ("fake_package",) - distr.command_options["build_sphinx"] = {"source_dir": ["a", "."]} - pkg_fixture = fixtures.PythonPackage( - "fake_package", [("fake_module.py", "")]) - self.useFixture(pkg_fixture) - self.useFixture(DiveDir(pkg_fixture.base)) - - build_doc = build_sphinx(distr) - build_doc.run() - - self.assertTrue( - os.path.exists("api/autoindex.rst")) - self.assertTrue( - os.path.exists("api/fake_package.fake_module.rst")) - - -class ParseRequirementsTest(utils.BaseTestCase): - - def setUp(self): - super(ParseRequirementsTest, self).setUp() - self.useFixture(fixtures.NestedTempfile()) - (fd, self.tmp_file) = mkstemp(prefix='openstack', suffix='.setup') - - def test_parse_requirements_normal(self): - with open(self.tmp_file, 'w') as fh: - fh.write("foo\nbar") - self.assertEqual(['foo', 'bar'], - setup.parse_requirements([self.tmp_file])) - - def test_parse_requirements_with_git_egg_url(self): - with open(self.tmp_file, 'w') as fh: - fh.write("-e git://foo.com/zipball#egg=bar") - self.assertEqual(['bar'], setup.parse_requirements([self.tmp_file])) - - def test_parse_requirements_with_http_egg_url(self): - with open(self.tmp_file, 'w') as fh: - fh.write("https://foo.com/zipball#egg=bar") - self.assertEqual(['bar'], setup.parse_requirements([self.tmp_file])) - - def test_parse_requirements_removes_index_lines(self): - with open(self.tmp_file, 'w') as fh: - fh.write("-f foobar") - self.assertEqual([], setup.parse_requirements([self.tmp_file])) - - def test_parse_requirements_removes_argparse(self): - with open(self.tmp_file, 'w') as fh: - fh.write("argparse") - if sys.version_info >= (2, 7): - self.assertEqual([], setup.parse_requirements([self.tmp_file])) - - def test_get_requirement_from_file_empty(self): - actual = setup.get_reqs_from_files([]) - self.assertEqual([], actual) - - -class ParseDependencyLinksTest(utils.BaseTestCase): - - def setUp(self): - super(ParseDependencyLinksTest, self).setUp() - self.useFixture(fixtures.NestedTempfile()) - (fd, self.tmp_file) = mkstemp(prefix="openstack", suffix=".setup") - - def test_parse_dependency_normal(self): - with open(self.tmp_file, "w") as fh: - fh.write("http://test.com\n") - self.assertEqual( - ["http://test.com"], - setup.parse_dependency_links([self.tmp_file])) - - def test_parse_dependency_with_git_egg_url(self): - with open(self.tmp_file, "w") as fh: - fh.write("-e git://foo.com/zipball#egg=bar") - self.assertEqual( - ["git://foo.com/zipball#egg=bar"], - setup.parse_dependency_links([self.tmp_file])) diff --git a/tests/unit/test_version.py b/tests/unit/test_version.py deleted file mode 100644 index 7f80de3..0000000 --- a/tests/unit/test_version.py +++ /dev/null @@ -1,75 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2012 Red Hat, Inc. -# 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. - -import StringIO -import sys - -from oslo.config import cfg - -from openstack.common import version -from tests import utils - - -class DeferredVersionTestCase(utils.BaseTestCase): - - def setUp(self): - super(DeferredVersionTestCase, self).setUp() - self.conf = cfg.ConfigOpts() - - def test_cached_version(self): - class MyVersionInfo(version.VersionInfo): - def _get_version_from_pkg_resources(self): - return "5.5.5.5" - - deferred_string = MyVersionInfo("openstack").\ - cached_version_string() - self.conf([], project="project", prog="prog", version=deferred_string) - self.assertEquals("5.5.5.5", str(self.conf.version)) - - def test_print_cached_version(self): - class MyVersionInfo(version.VersionInfo): - def _get_version_from_pkg_resources(self): - return "5.5.5.5" - - deferred_string = MyVersionInfo("openstack")\ - .cached_version_string() - self.stubs.Set(sys, 'stderr', StringIO.StringIO()) - self.assertRaises(SystemExit, - self.conf, ['--version'], - project="project", - prog="prog", - version=deferred_string) - self.assertEquals("5.5.5.5", sys.stderr.getvalue().strip()) - - def test_print_cached_version_with_long_string(self): - my_version = "11111222223333344444555556666677777888889999900000" - - class MyVersionInfo(version.VersionInfo): - def _get_version_from_pkg_resources(self): - return my_version - - deferred_string = MyVersionInfo("openstack")\ - .cached_version_string() - - for i in range(50): - self.stubs.Set(sys, 'stderr', StringIO.StringIO()) - self.assertRaises(SystemExit, - self.conf, ['--version'], - project="project", - prog="prog", - version=deferred_string) - self.assertEquals(my_version, sys.stderr.getvalue().strip()) diff --git a/tools/flakes.py b/tools/flakes.py deleted file mode 100644 index 191bd6e..0000000 --- a/tools/flakes.py +++ /dev/null @@ -1,24 +0,0 @@ -""" - wrapper for pyflakes to ignore gettext based warning: - "undefined name '_'" - - Synced in from openstack-common -""" - -__all__ = ['main'] - -import __builtin__ as builtins -import sys - -import pyflakes.api -from pyflakes import checker - - -def main(): - checker.Checker.builtIns = (set(dir(builtins)) | - set(['_']) | - set(checker._MAGIC_GLOBALS)) - sys.exit(pyflakes.api.main()) - -if __name__ == "__main__": - main() diff --git a/tools/pip-requires b/tools/pip-requires index b31640b..067af58 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,3 +1,5 @@ +d2to1>=0.2.10,<0.3 +pbr>=0.5,<0.6 PasteDeploy==1.5.0 WebOb==1.2.3 eventlet>=0.12.0 |