Merge pull request #965 from BDadmehr0/mypy

mypy fix import-untyped error
SalamLang · Jan 17, 2025 · e89cc0a · e89cc0a
2 parents 141255d + 9bff9fc
commit e89cc0a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -138,4 +138,5 @@ repos:
     rev: 'v1.14.1'
     hooks:
       - id: mypy
-        args: ['--explicit-package-bases', '--ignore-missing-imports']
+        verbose: true
+        args: ["--non-interactive", "--ignore-missing-imports"]
diff --git a/build/styles/background-position-y.py b/build/styles/background-position-y.py
@@ -7,11 +7,6 @@
 sys.path.append(os.path.join(parent_dir, "data", "styles"))
 sys.path.append(os.path.join(parent_dir, "data", "styles", "values"))
 
-<<<<<<< HEAD
-from lang import Lang
-from type import Type
-from property import Property
-=======
 from prebuild import Prebuild
 from lang import Lang
 from type import Type
@@ -27,7 +22,6 @@ def type_to_property_type(type_: Type) -> PropertyType:
     }
     return type_mapping.get(type_, PropertyType.String)  # Default to STRING
 
->>>>>>> 1220583a90f5dca34ed8626033cd3f7a6efabfee
 
 if __name__ == "__main__":
     property = Property()