- openstack/manila-ui
- openstack/neutron
- openstack/neutron-fwaas
- - openstack/neutron-lbaas
- openstack/neutron-vpnaas
- openstack/nova
- openstack/octavia
- openstack-python-jobs
- openstack-python35-jobs
- openstack-python36-jobs
+ - openstack-python37-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
check:
Chuck Short <chuck.short@canonical.com>
Clark Boylan <clark.boylan@gmail.com>
Claudiu Popa <cpopa@cloudbasesolutions.com>
+Corey Bryant <corey.bryant@canonical.com>
Dan Prince <dprince@redhat.com>
Darragh Bailey <dbailey@hp.com>
Davanum Srinivas <dims@linux.vnet.ibm.com>
CHANGES
=======
+5.2.1
+-----
+
+* Add openstack-tox-py37 job
+* Set subparser argument required
+* Remove neutron-lbaas
+* Update Sphinx requirement
+* Fix white space handling in file names
+
5.2.0
-----
Metadata-Version: 2.1
Name: pbr
-Version: 5.2.0
+Version: 5.2.1
Summary: Python Build Reasonableness
Home-page: https://docs.openstack.org/pbr/latest/
Author: OpenStack
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0
Metadata-Version: 2.1
Name: pbr
-Version: 5.2.0
+Version: 5.2.1
Summary: Python Build Reasonableness
Home-page: https://docs.openstack.org/pbr/latest/
Author: OpenStack
releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml
releasenotes/notes/deprecate-testr-nose-integration-56e3e11248d946fc.yaml
releasenotes/notes/fix-global-replace-of-src-prefix-in-glob-eb850b94ca96993e.yaml
+releasenotes/notes/fix-handling-of-spaces-in-data-files-glob-0fe0c398d70dfea8.yaml
releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml
releasenotes/notes/fix-mapping-value-explode-with-equal-sign-41bf822fa4dd0e68.yaml
releasenotes/notes/ignore-find-links-07cf54f465aa33a6.yaml
version=str(pbr.version.VersionInfo('pbr')))
subparsers = parser.add_subparsers(
- title='commands', description='valid commands', help='additional help')
+ title='commands', description='valid commands', help='additional help',
+ dest='cmd')
+ subparsers.required = True
cmd_sha = subparsers.add_parser('sha', help='print sha of package')
cmd_sha.set_defaults(func=get_sha)
# under the License.
import os
+import shlex
import sys
from pbr import find_package
return os.path.join(get_manpath(), 'man%s' % section)
+def unquote_path(path):
+ # unquote the full path, e.g: "'a/full/path'" becomes "a/full/path", also
+ # strip the quotes off individual path components because os.walk cannot
+ # handle paths like: "'i like spaces'/'another dir'", so we will pass it
+ # "i like spaces/another dir" instead.
+ return "".join(shlex.split(path))
+
+
class FilesConfig(base.BaseConfig):
section = 'files'
target = target.strip()
if not target.endswith(os.path.sep):
target += os.path.sep
- for (dirpath, dirnames, fnames) in os.walk(source_prefix):
+ unquoted_prefix = unquote_path(source_prefix)
+ unquoted_target = unquote_path(target)
+ for (dirpath, dirnames, fnames) in os.walk(unquoted_prefix):
# As source_prefix is always matched, using replace with a
# a limit of one is always going to replace the path prefix
# and not accidentally replace some text in the middle of
# the path
- new_prefix = dirpath.replace(source_prefix, target, 1)
- finished.append("%s = " % new_prefix)
+ new_prefix = dirpath.replace(unquoted_prefix,
+ unquoted_target, 1)
+ finished.append("'%s' = " % new_prefix)
finished.extend(
- [" %s" % os.path.join(dirpath, f) for f in fnames])
+ [" '%s'" % os.path.join(dirpath, f) for f in fnames])
else:
finished.append(line)
self.data_files = "\n".join(finished)
def add_man_path(self, man_path):
- self.data_files = "%s\n%s =" % (self.data_files, man_path)
+ self.data_files = "%s\n'%s' =" % (self.data_files, man_path)
def add_man_page(self, man_page):
- self.data_files = "%s\n %s" % (self.data_files, man_page)
+ self.data_files = "%s\n '%s'" % (self.data_files, man_page)
def get_man_sections(self):
man_sections = dict()
pkg_etc = os.path.join(pkg_fixture.base, 'etc')
pkg_ansible = os.path.join(pkg_fixture.base, 'ansible',
'kolla-ansible', 'test')
+ dir_spcs = os.path.join(pkg_fixture.base, 'dir with space')
+ dir_subdir_spc = os.path.join(pkg_fixture.base, 'multi space',
+ 'more spaces')
pkg_sub = os.path.join(pkg_etc, 'sub')
subpackage = os.path.join(
pkg_fixture.base, 'fake_package', 'subpackage')
os.makedirs(pkg_sub)
os.makedirs(subpackage)
os.makedirs(pkg_ansible)
+ os.makedirs(dir_spcs)
+ os.makedirs(dir_subdir_spc)
with open(os.path.join(pkg_etc, "foo"), 'w') as foo_file:
foo_file.write("Foo Data")
with open(os.path.join(pkg_sub, "bar"), 'w') as foo_file:
baz_file.write("Baz Data")
with open(os.path.join(subpackage, "__init__.py"), 'w') as foo_file:
foo_file.write("# empty")
+ with open(os.path.join(dir_spcs, "file with spc"), 'w') as spc_file:
+ spc_file.write("# empty")
+ with open(os.path.join(dir_subdir_spc, "file with spc"), 'w') as file_:
+ file_.write("# empty")
self.useFixture(base.DiveDir(pkg_fixture.base))
)
files.FilesConfig(config, 'fake_package').run()
self.assertIn(
- '\netc/pbr/ = \n etc/foo\netc/pbr/sub = \n etc/sub/bar',
+ "\n'etc/pbr/' = \n 'etc/foo'\n'etc/pbr/sub' = \n 'etc/sub/bar'",
config['files']['data_files'])
+ def test_data_files_with_spaces(self):
+ config = dict(
+ files=dict(
+ data_files="\n 'i like spaces' = 'dir with space'/*"
+ )
+ )
+ files.FilesConfig(config, 'fake_package').run()
+ self.assertIn(
+ "\n'i like spaces/' = \n 'dir with space/file with spc'",
+ config['files']['data_files'])
+
+ def test_data_files_with_spaces_subdirectories(self):
+ # test that we can handle whitespace in subdirectories
+ data_files = "\n 'one space/two space' = 'multi space/more spaces'/*"
+ expected = (
+ "\n'one space/two space/' = "
+ "\n 'multi space/more spaces/file with spc'")
+ config = dict(
+ files=dict(
+ data_files=data_files
+ )
+ )
+ files.FilesConfig(config, 'fake_package').run()
+ self.assertIn(expected, config['files']['data_files'])
+
+ def test_data_files_with_spaces_quoted_components(self):
+ # test that we can quote individual path components
+ data_files = (
+ "\n'one space'/'two space' = 'multi space'/'more spaces'/*"
+ )
+ expected = ("\n'one space/two space/' = "
+ "\n 'multi space/more spaces/file with spc'")
+ config = dict(
+ files=dict(
+ data_files=data_files
+ )
+ )
+ files.FilesConfig(config, 'fake_package').run()
+ self.assertIn(expected, config['files']['data_files'])
+
def test_data_files_globbing_source_prefix_in_directory_name(self):
# We want to test that the string, "docs", is not replaced in a
# subdirectory name, "sub-docs"
)
files.FilesConfig(config, 'fake_package').run()
self.assertIn(
- '\nshare/ansible/ = '
- '\nshare/ansible/kolla-ansible = '
- '\nshare/ansible/kolla-ansible/test = '
- '\n ansible/kolla-ansible/test/baz',
+ "\n'share/ansible/' = "
+ "\n'share/ansible/kolla-ansible' = "
+ "\n'share/ansible/kolla-ansible/test' = "
+ "\n 'ansible/kolla-ansible/test/baz'",
config['files']['data_files'])
config = config_from_ini(ini)
kwargs = util.setup_cfg_to_setup_kwargs(config)
self.assertEqual(['foo', 'bar'], kwargs['provides_extras'])
+
+
+class TestDataFilesParsing(base.BaseTestCase):
+
+ scenarios = [
+ ('data_files', {
+ 'config_text': """
+ [files]
+ data_files =
+ 'i like spaces/' =
+ 'dir with space/file with spc 2'
+ 'dir with space/file with spc 1'
+ """,
+ 'data_files': [
+ ('i like spaces/', ['dir with space/file with spc 2',
+ 'dir with space/file with spc 1'])
+ ]
+ })]
+
+ def test_handling_of_whitespace_in_data_files(self):
+ config = config_from_ini(self.config_text)
+ kwargs = util.setup_cfg_to_setup_kwargs(config)
+
+ self.assertEqual(self.data_files,
+ list(kwargs['data_files']))
from collections import defaultdict
import os
import re
+import shlex
import sys
import traceback
for line in in_cfg_value:
if '=' in line:
key, value = line.split('=', 1)
- key, value = (key.strip(), value.strip())
+ key_unquoted = shlex.split(key.strip())[0]
+ key, value = (key_unquoted, value.strip())
if key in data_files:
# Multiple duplicates of the same package name;
# this is for backwards compatibility of the old
# format prior to d2to1 0.2.6.
prev = data_files[key]
- prev.extend(value.split())
+ prev.extend(shlex.split(value))
else:
- prev = data_files[key.strip()] = value.split()
+ prev = data_files[key.strip()] = shlex.split(value)
elif firstline:
raise errors.DistutilsOptionError(
'malformed package_data first line %r (misses '
'"=")' % line)
else:
- prev.extend(line.strip().split())
+ prev.extend(shlex.split(line.strip()))
firstline = False
if arg == 'data_files':
# the data_files value is a pointlessly different structure
export PROJECTS="openstack/zaqar $PROJECTS"
export PROJECTS="openstack/neutron $PROJECTS"
export PROJECTS="openstack/neutron-fwaas $PROJECTS"
- export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export PROJECTS="openstack/octavia $PROJECTS"
export PROJECTS="openstack/neutron-vpnaas $PROJECTS"
export PROJECTS="openstack/nova $PROJECTS"
export PROJECTS="openstack/zaqar $PROJECTS"
export PROJECTS="openstack/neutron $PROJECTS"
export PROJECTS="openstack/neutron-fwaas $PROJECTS"
- export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export PROJECTS="openstack/octavia $PROJECTS"
export PROJECTS="openstack/neutron-vpnaas $PROJECTS"
export PROJECTS="openstack/nova $PROJECTS"
--- /dev/null
+---
+fixes:
+ - |
+ Fixes the handling of spaces in data_files globs. Please see `bug 1810934
+ <https://bugs.launchpad.net/pbr/+bug/1810934>`_ for more details.
coverage!=4.4,>=4.0 # Apache-2.0
# optionally exposed by distutils commands
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
[tox]
-minversion = 2.0
-envlist = py{27,35,36},pep8,docs
+minversion = 3.1
+envlist = pep8,py{37,36,35,27},docs
+ignore_basepython_conflict = True
+skip_missing_interpreters = True
[testenv]
usedevelop = True
projects / platform / upstream / python3-pbr.git / commitdiff