Skip to content

Commit

Permalink
🐛 Fix failing project build.
Browse files Browse the repository at this point in the history
Signed-off-by: rjdbcm <[email protected]>
  • Loading branch information
rjdbcm committed Apr 24, 2024
1 parent bc7b816 commit c87cbfd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ozi/templates/project.array.meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ option(
'python-dependencies',
type: 'array',
value: [
{%- for requires in spec.python.build.requires %}
'{{ requires|to_distribution }}',
{%- for requires in spec.python.build.requires.keys() %}
'{{ requires }}',
{%- endfor %}
]
)
Expand Down
8 changes: 7 additions & 1 deletion ozi/templates/project.meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ project(
)
fs = import('fs')
pymod = import('python')
python_dependencies = get_option('python-dependencies')
python = pymod.find_installation(
'python3',
modules: python_dependencies,
required: false,
disabler: true,
)
project_name = meson.project_name()
pip_compile = find_program('pip-compile', required: true)
root_files = [
Expand Down Expand Up @@ -93,7 +100,6 @@ foreach source : root_files
fs.copyfile(source)
endif
endforeach
run_command(python, ['-c', sync_pkg_readme], check: true)
root_children = ['{{ project.name|underscorify }}', 'tests']
foreach child: root_children
subdir(child)
Expand Down
3 changes: 2 additions & 1 deletion ozi/templates/project.name/__init__.py.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#}
"""{{ project.name }} module"""
{%- for line in project.copyright_head.split('\n') %}

{% for line in project.copyright_head.split('\n') %}
{{ '# ' ~ line }}
{%- endfor %}
{%- if user_template %}
Expand Down

0 comments on commit c87cbfd

Please sign in to comment.