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

allow regex pattern for conf tools.info.package_id:confs #14621

Merged
Merged
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
10 changes: 6 additions & 4 deletions conans/model/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,12 @@ def copy_conaninfo_conf(self):
# Reading the list of all the configurations selected by the user to use for the package_id
package_id_confs = self.get("tools.info.package_id:confs", default=[], check_type=list)
for conf_name in package_id_confs:
value = self.get(conf_name)
# Pruning any empty values, those should not affect package ID
if value:
result.define(conf_name, value)
matching_confs = [c for c in self._values if re.match(conf_name, c)] or [conf_name]
for name in matching_confs:
value = self.get(name)
# Pruning any empty values, those should not affect package ID
if value:
result.define(name, value)
return result

def set_relative_base_folder(self, folder):
Expand Down
59 changes: 59 additions & 0 deletions conans/test/integration/configuration/conf/test_conf_copy.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import os
import platform
import textwrap

import pytest
from mock import patch

from conan import conan_version
from conans.errors import ConanException
from conans.util.files import save, load
from conans.test.utils.tools import TestClient

from conans.model.conf import Conf


def test_copy_conaninfo_conf():
conf = Conf()

conf.define("core:non_interactive", True)
conf.define("tools.cmake.cmaketoolchain:generator", True)
conf.define("tools.deployer:symlinks", True)
conf.define("user.myconf:cmake-test", True)

pattern = [".*"]
conf.define("tools.info.package_id:confs", pattern)
result = conf.copy_conaninfo_conf().dumps()
assert "tools.info.package_id:confs=%s" % pattern in result
assert "core:non_interactive" in result
assert "tools.cmake.cmaketoolchain:generator=True" in result
assert "tools.deployer:symlinks" in result
assert "user.myconf:cmake-test" in result

pattern = ["tools\..*"]
conf.define("tools.info.package_id:confs", pattern)
result = conf.copy_conaninfo_conf().dumps()
assert "tools.info.package_id:confs=%s" % pattern in result
assert "core:non_interactive" not in result
assert "tools.cmake.cmaketoolchain:generator=True" in result
assert "tools.deployer:symlinks" in result
assert "user.myconf:cmake-test" not in result

pattern = [".*cmake"]
conf.define("tools.info.package_id:confs", pattern)
result = conf.copy_conaninfo_conf().dumps()
assert "tools.info.package_id:confs=%s" % pattern not in result
assert "core:non_interactive" not in result
assert "tools.cmake.cmaketoolchain:generator=True" in result
assert "tools.deployer:symlinks" not in result
assert "user.myconf:cmake-test" in result

pattern = ["(tools.deploy|core)"]
conf.define("tools.info.package_id:confs", pattern)
result = conf.copy_conaninfo_conf().dumps()
assert "tools.info.package_id:confs=%s" % pattern not in result
assert "core:non_interactive" in result
assert "tools.cmake.cmaketoolchain:generator=True" not in result
assert "tools.deployer:symlinks" in result
assert "user.myconf:cmake-test" not in result