Skip to content

Commit 0bf1c78

Browse files
committed
Formatting
Contribute to NP-637
1 parent 9d1d9be commit 0bf1c78

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

conanfile.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import os
44

55
from conan import ConanFile
6-
from conan.errors import ConanInvalidConfiguration
7-
from conan.tools.files import copy, mkdir, update_conandata
8-
from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake, cmake_layout
96
from conan.tools.build import check_min_cppstd
7+
from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake, cmake_layout
8+
from conan.tools.files import copy, mkdir, update_conandata
109
from conan.tools.scm import Version, Git
1110

1211
required_conan_version = ">=2.7.0"
@@ -61,8 +60,10 @@ def export_sources(self):
6160
copy(self, "CuraEngine.rc", self.recipe_folder, self.export_sources_folder)
6261
copy(self, "LICENSE", self.recipe_folder, self.export_sources_folder)
6362
copy(self, "*", os.path.join(self.recipe_folder, "src"), os.path.join(self.export_sources_folder, "src"))
64-
copy(self, "*", os.path.join(self.recipe_folder, "include"), os.path.join(self.export_sources_folder, "include"))
65-
copy(self, "*", os.path.join(self.recipe_folder, "benchmark"), os.path.join(self.export_sources_folder, "benchmark"))
63+
copy(self, "*", os.path.join(self.recipe_folder, "include"),
64+
os.path.join(self.export_sources_folder, "include"))
65+
copy(self, "*", os.path.join(self.recipe_folder, "benchmark"),
66+
os.path.join(self.export_sources_folder, "benchmark"))
6667
copy(self, "*", os.path.join(self.recipe_folder, "stress_benchmark"),
6768
os.path.join(self.export_sources_folder, "stress_benchmark"))
6869
copy(self, "*", os.path.join(self.recipe_folder, "tests"), os.path.join(self.export_sources_folder, "tests"))
@@ -138,7 +139,8 @@ def generate(self):
138139
tc.variables["ENABLE_TESTING"] = not self.conf.get("tools.build:skip_test", False, check_type=bool)
139140
tc.variables["ENABLE_BENCHMARKS"] = self.options.enable_benchmarks
140141
tc.variables["EXTENSIVE_WARNINGS"] = self.options.enable_extensive_warnings
141-
tc.variables["OLDER_APPLE_CLANG"] = self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "14"
142+
tc.variables["OLDER_APPLE_CLANG"] = self.settings.compiler == "apple-clang" and Version(
143+
self.settings.compiler.version) < "14"
142144
tc.variables["ENABLE_THREADING"] = not (self.settings.arch == "wasm" and self.settings.os == "Emscripten")
143145
if self.options.enable_plugins:
144146
tc.variables["ENABLE_PLUGINS"] = True
@@ -182,7 +184,7 @@ def build(self):
182184
cmake.configure()
183185
cmake.build()
184186

185-
self.send_sentry_debug_files(binary_basename = "CuraEngine")
187+
self.send_sentry_debug_files(binary_basename="CuraEngine")
186188

187189
def deploy(self):
188190
copy(self, "CuraEngine*", src=os.path.join(self.package_folder, "bin"), dst=self.deploy_folder)
@@ -222,5 +224,4 @@ def package_info(self):
222224
"package.json"
223225
]
224226
}
225-
226227
self.conf_info.define(f"user.{self.name.lower()}:package_json", package_json)

0 commit comments

Comments
 (0)