Skip to content

Commit fa9ec63

Browse files
committed
ci lint fix
1 parent 1e1e160 commit fa9ec63

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

recipes/botan/all/conanfile.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from conan import ConanFile
22
from conan.tools.files import get, patch, chdir, copy, mkdir
33
from conan.tools.microsoft import is_msvc, msvc_runtime_flag
4-
from conan.tools.apple import is_apple_os
4+
from conan.tools.apple import is_apple_os, XCRun
55
from conan.tools.env import Environment
66
from conan.tools.build import build_jobs
77
from packaging.version import Version
@@ -95,8 +95,8 @@ def _source_subfolder(self):
9595
return "sources"
9696

9797
def export_sources(self):
98-
for patch in self.conan_data.get("patches", {}).get(self.version, []):
99-
self.copy(patch["patch_file"])
98+
for p in self.conan_data.get("patches", {}).get(self.version, []):
99+
self.copy(p["patch_file"])
100100

101101
def config_options(self):
102102
if self.settings.os == 'Windows':
@@ -141,9 +141,6 @@ def requirements(self):
141141
if self.options.with_boost:
142142
self.requires("boost/1.79.0")
143143

144-
def package_info(self):
145-
self.cpp_info.libs = ["botan"]
146-
147144
@property
148145
def _required_boost_components(self):
149146
return ['coroutine', 'system']
@@ -185,8 +182,8 @@ def source(self):
185182
get(conanfile=self, **self.conan_data['sources'][self.version], strip_root=True, destination=self._source_subfolder)
186183

187184
def build(self):
188-
for patch in self.conan_data.get('patches', {}).get(self.version, []):
189-
patch(self, **patch)
185+
for p in self.conan_data.get('patches', {}).get(self.version, []):
186+
patch(self, **p)
190187
with chdir(self, self._source_subfolder):
191188
self.run(self._configure_cmd)
192189
self.run(self._make_cmd)
@@ -276,7 +273,7 @@ def _configure_cmd(self):
276273
self.settings.get_safe('os.subsystem'),
277274
self.settings.get_safe('arch'))
278275
botan_extra_cxx_flags.append(macos_min_version)
279-
macos_sdk_path = '-isysroot {}'.format(tools.XCRun(self.settings).sdk_path)
276+
macos_sdk_path = '-isysroot {}'.format(XCRun(self.settings).sdk_path)
280277
botan_extra_cxx_flags.append(macos_sdk_path)
281278

282279
# This is to work around botan's configure script that *replaces* its

recipes/botan/all/test_package/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class TestPackageConan(ConanFile):
88
settings = "os", "arch", "compiler", "build_type"
99

1010
def requirements(self):
11-
self.requires("botan/[^3.0.0]");
11+
self.requires("botan/[^3.0.0]")
1212

1313
def generate(self):
1414
tc = CMakeToolchain(self)

0 commit comments

Comments
 (0)