Skip to content

Commit 2d19a00

Browse files
[gtkmm] v2 linting
1 parent 0db4941 commit 2d19a00

File tree

1 file changed

+23
-15
lines changed

1 file changed

+23
-15
lines changed

recipes/gtkmm/all/conanfile.py

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
import os
22
import re
33

4-
from conan.tools.microsoft import is_msvc
5-
from conans import ConanFile, Meson, tools
4+
from conan import ConanFile
5+
from conan.tools import (
6+
build,
7+
files,
8+
microsoft,
9+
scm
10+
)
11+
from conans import Meson, tools
612
from conans.errors import ConanInvalidConfiguration
713

814
required_conan_version = ">=1.33.0"
@@ -44,7 +50,7 @@ def export_sources(self):
4450
def config_options(self):
4551
if self.settings.os == "Windows":
4652
del self.options.fPIC
47-
if is_msvc(self):
53+
if microsoft.is_msvc(self):
4854
# Static builds not supported by MSVC
4955
self.options.shared = True
5056

@@ -68,15 +74,18 @@ def _minimum_compilers_version(self):
6874

6975
def validate(self):
7076
if self.settings.compiler.get_safe("cppstd"):
71-
tools.check_min_cppstd(self, self._minimum_cpp_standard)
77+
build.check_min_cppstd(self, self._minimum_cpp_standard)
78+
7279
min_version = self._minimum_compilers_version.get(str(self.settings.compiler))
7380
if not min_version:
7481
self.output.warn("{} recipe lacks information about the {} compiler support.".format(
7582
self.name, self.settings.compiler))
7683
else:
77-
if tools.Version(self.settings.compiler.version) < min_version:
78-
raise ConanInvalidConfiguration("{} requires C++{} support. The current compiler {} {} does not support it.".format(
79-
self.name, self._minimum_cpp_standard, self.settings.compiler, self.settings.compiler.version))
84+
if scm.Version(self.settings.compiler.version) < min_version:
85+
raise ConanInvalidConfiguration(
86+
f"{self.name} requires C++{self._minimum_cpp_standard} support. " +
87+
f"The current compiler {self.settings.compiler} {self.settings.compiler.version} does not " +
88+
f"support it.")
8089

8190
def build_requirements(self):
8291
self.build_requires("meson/0.62.2")
@@ -87,18 +96,18 @@ def requirements(self):
8796
# gtkmm has a direct dependency on cairo-gobject which is not explicit in the meson configuration
8897
self.requires("cairo/1.17.4")
8998
self.requires("glibmm/2.72.1")
90-
self.requires("glib/2.73.0")
99+
self.requires("glib/2.73.3")
91100
self.requires("gtk/4.7.0")
92101
self.requires("libsigcpp/3.0.7")
93102
self.requires("pangomm/2.50.0")
94103

95104
def source(self):
96-
tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder)
105+
files.get(self, **self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder)
97106

98107
def _patch_sources(self):
99-
if is_msvc(self):
108+
if microsoft.is_msvc(self):
100109
for patch in self.conan_data.get("patches", {}).get(self.version, []):
101-
tools.patch(**patch)
110+
files.patch(self, **patch)
102111

103112
def _configure_meson(self):
104113
meson = Meson(self)
@@ -156,13 +165,12 @@ def package(self):
156165
meson.install()
157166

158167
self.copy(pattern="COPYING", src=self._source_subfolder, dst="licenses")
159-
tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
160-
tools.remove_files_by_mask(os.path.join(self.package_folder, "bin"), "*.pdb")
161-
tools.remove_files_by_mask(os.path.join(self.package_folder, "lib"), "*.pdb")
168+
files.rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
169+
files.rm(self, "*.pdb", self.package_folder, recursive=True)
162170

163171
@property
164172
def _libname(self):
165-
if is_msvc(self):
173+
if microsoft.is_msvc(self):
166174
return f"gtkmm-{self._msvc_toolset_suffix}-4.0"
167175
return "gtkmm-4.0"
168176

0 commit comments

Comments
 (0)