Skip to content
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.

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

Add optional requirements fields to all templates #12830

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions conan/cli/commands/new.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ def get_template_vars():
ast = env.parse(templ_str)
template_vars.extend(meta.find_undeclared_variables(ast))

injected_vars = {"conan_version", "package_name"}
template_vars = list(set(template_vars) - injected_vars)
injected_vars = {"conan_version", "package_name", "as_iterable"}
optional_vars = {"requires"}
template_vars = list(set(template_vars) - injected_vars - optional_vars)
template_vars.sort()
return template_vars

Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/autoools_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ def build(self):
def package(self):
autotools = Autotools(self)
autotools.install()

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
"""
makefile_am_exe = """
bin_PROGRAMS = {{name}}
Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/autotools_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ def package(self):

def package_info(self):
self.cpp_info.libs = ["{{name}}"]

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
"""

configure_ac = """
Expand Down
9 changes: 8 additions & 1 deletion conan/internal/api/new/bazel_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,14 @@ def package(self):
build = os.path.join(self.build_folder, "bazel-bin", "main")
copy(self, "{{name}}", build, dest_bin, keep_path=False)
copy(self, "{{name}}.exe", build, dest_bin, keep_path=False)
"""

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
"""

test_conanfile_exe_v2 = """from conan import ConanFile
from conan.tools.build import can_run
Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/bazel_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ def package(self):

def package_info(self):
self.cpp_info.libs = ["{{name}}"]

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
"""


Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/cmake_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ def build(self):
def package(self):
cmake = CMake(self)
cmake.install()

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
'''

cmake_exe_v2 = """cmake_minimum_required(VERSION 3.15)
Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/cmake_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ def package(self):

def package_info(self):
self.cpp_info.libs = ["{{name}}"]

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
'''

cmake_v2 = """cmake_minimum_required(VERSION 3.15)
Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/meson_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ def build(self):
def package(self):
meson = Meson(self)
meson.install()

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
"""

test_conanfile_exe_v2 = """import os
Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/meson_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ def package(self):

def package_info(self):
self.cpp_info.libs = ["{{name}}"]

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
"""


Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/msbuild_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ def build(self):
def package(self):
copy(self, "*{{name}}.exe", src=self.build_folder,
dst=os.path.join(self.package_folder, "bin"), keep_path=False)

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
"""


Expand Down
7 changes: 7 additions & 0 deletions conan/internal/api/new/msbuild_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,13 @@ def package(self):

def package_info(self):
self.cpp_info.libs = ["{{name}}"]

{% if requires is defined -%}
def requirements(self):
{% for require in as_iterable(requires) -%}
self.requires("{{ require }}")
{% endfor %}
{%- endif %}
"""


Expand Down