aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vscode/settings.json9
-rw-r--r--conanfile.py8
-rw-r--r--requirements.txt1
3 files changed, 11 insertions, 7 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 51bcf93..2e9f833 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,7 +4,8 @@
"C_Cpp.autoAddFileAssociations": false,
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
- // "[python]": {
- // "editor.defaultFormatter": "ms-python.black-formatter"
- // },
-} \ No newline at end of file
+
+ "[python]": {
+ "editor.defaultFormatter": "ms-python.black-formatter"
+ },
+ } \ No newline at end of file
diff --git a/conanfile.py b/conanfile.py
index 4712156..cc79bae 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -2,6 +2,7 @@ from conan import ConanFile
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.env import VirtualBuildEnv
+
class KernelConan(ConanFile):
name = "kernel"
description = "The kernel of TeachOS"
@@ -46,9 +47,10 @@ class KernelConan(ConanFile):
def layout(self):
cmake_layout(self, src_folder="source")
+
class PlatformIncludeBlock:
- template = "include(\"../cmake/Platforms/{{platform}}.cmake\")"
+ template = 'include("../cmake/Platforms/{{platform}}.cmake")'
-def context(self):
- return { "platform": None }
+def context(self):
+ return {"platform": None}
diff --git a/requirements.txt b/requirements.txt
index 4021434..4479984 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
black>=23
conan~=1.61
+mypy~=1.5