Skip to content

Allow setup py data to contain Nones #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dirk-thomas merged 1 commit into from
Oct 24, 2019
Merged

Allow setup py data to contain Nones #255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions colcon_core/task/python/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ async def build(self, *, additional_hooks=None): # noqa: D102
'--build-directory', os.path.join(args.build_base, 'build'),
'--no-deps',
]
if setup_py_data.get('data_files', []):
if setup_py_data.get('data_files'):
cmd += ['install_data', '--install-dir', args.install_base]
self._append_install_layout(args, cmd)
rc = await check_call(
Expand Down Expand Up @@ -138,7 +138,7 @@ def _undo_install(self, pkg, args, setup_py_data, python_lib):
with open(install_log, 'r') as h:
lines = [l.rstrip() for l in h.readlines()]

packages = setup_py_data.get('packages', [])
packages = setup_py_data.get('packages') or []
for module_name in packages:
if module_name in sys.modules:
logger.warning(
Expand Down Expand Up @@ -181,8 +181,8 @@ def _symlinks_in_build(self, args, setup_py_data):
if os.path.exists(os.path.join(args.path, 'setup.cfg')):
items.append('setup.cfg')
# add all first level packages
package_dir = setup_py_data.get('package_dir', {})
for package in setup_py_data.get('packages', []):
package_dir = setup_py_data.get('package_dir') or {}
for package in setup_py_data.get('packages') or []:
if '.' in package:
continue
if package in package_dir:
Expand All @@ -204,7 +204,7 @@ def _symlinks_in_build(self, args, setup_py_data):
.format_map(locals()))
items += py_modules_list
data_files = get_data_files_mapping(
setup_py_data.get('data_files', []))
setup_py_data.get('data_files') or [])
for source in data_files.keys():
# work around data files incorrectly defined as not relative
if os.path.isabs(source):
Expand Down