openstack/deb-python-pbr
Code Issues Proposed changes

Make hacking compliant.

Browse Source 
Change-Id: Ibbd091decfe377a43f691aaf26905edb40ff299f
This commit is contained in:
Monty Taylor
2013-03-19 18:33:08 -07:00
parent 27b621ad63
commit 3d10e09ccd
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pbr/packaging.py
View File

@@ -302,7 +302,8 @@ def _get_revno(git_dir):
def _get_version_from_git(pre_version): def _get_version_from_git(pre_version):
"""Return a version which is equal to the tag that's on the current """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 revision if there is one, or tag plus number of additional revisions
if the current revision has no tag.""" if the current revision has no tag.
"""
git_dir = _get_git_directory() git_dir = _get_git_directory()
if git_dir: if git_dir:

17
pbr/tests/test_setup.py
View File

@@ -18,9 +18,9 @@
import io import io
import os import os
import sys
import StringIO import StringIO
from tempfile import mkstemp import sys
import tempfile
import fixtures import fixtures
@@ -57,7 +57,8 @@ class MailmapTestCase(utils.BaseTestCase):
def setUp(self): def setUp(self):
super(MailmapTestCase, self).setUp() super(MailmapTestCase, self).setUp()
(fd, self.mailmap) = mkstemp(prefix='openstack', suffix='.setup') (fd, self.mailmap) = tempfile.mkstemp(prefix='openstack',
suffix='.setup')
def test_mailmap_with_fullname(self): def test_mailmap_with_fullname(self):
with open(self.mailmap, 'w') as mm_fh: with open(self.mailmap, 'w') as mm_fh:
@@ -159,8 +160,8 @@ class BuildSphinxTest(utils.BaseTestCase):
self.useFixture(fixtures.MonkeyPatch( self.useFixture(fixtures.MonkeyPatch(
"sphinx.setup_command.BuildDoc.run", lambda self: None)) "sphinx.setup_command.BuildDoc.run", lambda self: None))
from distutils.dist import Distribution from distutils import dist
distr = Distribution() distr = dist.Distribution()
distr.packages = ("fake_package",) distr.packages = ("fake_package",)
distr.command_options["build_sphinx"] = {"source_dir": ["a", "."]} distr.command_options["build_sphinx"] = {"source_dir": ["a", "."]}
pkg_fixture = fixtures.PythonPackage( pkg_fixture = fixtures.PythonPackage(
@@ -181,7 +182,8 @@ class ParseRequirementsTest(utils.BaseTestCase):
def setUp(self): def setUp(self):
super(ParseRequirementsTest, self).setUp() super(ParseRequirementsTest, self).setUp()
(fd, self.tmp_file) = mkstemp(prefix='openstack', suffix='.setup') (fd, self.tmp_file) = tempfile.mkstemp(prefix='openstack',
suffix='.setup')
def test_parse_requirements_normal(self): def test_parse_requirements_normal(self):
with open(self.tmp_file, 'w') as fh: with open(self.tmp_file, 'w') as fh:
@@ -221,7 +223,8 @@ class ParseDependencyLinksTest(utils.BaseTestCase):
def setUp(self): def setUp(self):
super(ParseDependencyLinksTest, self).setUp() super(ParseDependencyLinksTest, self).setUp()
(fd, self.tmp_file) = mkstemp(prefix="openstack", suffix=".setup") (fd, self.tmp_file) = tempfile.mkstemp(prefix="openstack",
suffix=".setup")
def test_parse_dependency_normal(self): def test_parse_dependency_normal(self):
with open(self.tmp_file, "w") as fh: with open(self.tmp_file, "w") as fh: