Skip to content

Commit

Permalink
[boost] Fix python-linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jgsogo committed Aug 10, 2022
1 parent 82d0344 commit ec02c22
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions recipes/boost/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def _dependencies(self):
dependencies_filepath = os.path.join(self.recipe_folder, "dependencies", self._dependency_filename)
if not os.path.isfile(dependencies_filepath):
raise ConanException("Cannot find {}".format(dependencies_filepath))
self._cached_dependencies = yaml.safe_load(open(dependencies_filepath))
self._cached_dependencies = yaml.safe_load(open(dependencies_filepath, encoding='utf-8'))
return self._cached_dependencies

def _all_dependent_modules(self, name):
Expand Down Expand Up @@ -760,7 +760,7 @@ def _clean(self):
]
for d in clean_dirs:
if os.path.isdir(d):
self.output.warn("removing '%s'".format(d))
self.output.warn("removing '{}'".format(d))
shutil.rmtree(d)

@property
Expand Down Expand Up @@ -953,11 +953,11 @@ def _gnu_cxx11_abi(self):
determined.
"""
try:
if str(self.settings.compiler.libcxx) == "libstdc++":
if str(self.settings.compiler.libcxxxxx) == "libstdc++":
return "0"
elif str(self.settings.compiler.libcxx) == "libstdc++11":
elif str(self.settings.compiler.libcxxssss) == "libstdc++11":
return "1"
except:
except ConanException:
pass
return None

Expand Down Expand Up @@ -1068,7 +1068,7 @@ def add_defines(library):
}.get(str(self.settings.compiler.libcxx), str(self.settings.compiler.libcxx))
cxx_flags.append("-stdlib={}".format(libcxx))
link_flags.append("-stdlib={}".format(libcxx))
except:
except ConanException:
pass

if self.options.error_code_header_only:
Expand Down Expand Up @@ -1333,7 +1333,6 @@ def _toolset_tag(self):
# Visual Studio | 17 | Windows | vc142 | depends on compiler.toolset
compiler = {
"apple-clang": "",
"msvc": "vc",
"Visual Studio": "vc",
"msvc": "vc",
}.get(str(self.settings.compiler), str(self.settings.compiler))
Expand Down

0 comments on commit ec02c22

Please sign in to comment.