Code cleanup, use pathlib, use pytest keyboard

Clean up checks and logics that are unnecessary due to MILC updates.
Use pathlib instead of os.path for readability.
Use the 'pytest' keyboard for the tests.
Add community layout for 'handwired/onekey/pytest' so we can test
community layouts.

1 files changed, 11 insertions, 10 deletions

diff --git a/lib/python/qmk/makefile.py b/lib/python/qmk/makefile.py
index 89494bbc0..8645056d2 100644
--- a/lib/python/qmk/makefile.py
+++ b/lib/python/qmk/makefile.py
@@ -1,8 +1,7 @@
 """ Functions for working with Makefiles
 """
-import os
+from pathlib import Path
 
-import qmk.path
 from qmk.errors import NoSuchKeyboardError
 
 
@@ -19,8 +18,9 @@ def parse_rules_mk_file(file, rules_mk=None):
     if not rules_mk:
         rules_mk = {}
 
-    if os.path.exists(file):
-        rules_mk_lines = qmk.path.file_lines(file)
+    file = Path(file)
+    if file.exists():
+        rules_mk_lines = file.read_text().split("\n")
 
         for line in rules_mk_lines:
             # Filter out comments
@@ -66,15 +66,16 @@ def get_rules_mk(keyboard):
         a dictionary with the content of the rules.mk file
     """
     # Start with qmk_firmware/keyboards
-    kb_path = os.path.join(os.getcwd(), "keyboards")
+    kb_path = Path.cwd() / "keyboards"
     # walk down the directory tree
     # and collect all rules.mk files
-    if os.path.exists(os.path.join(kb_path, keyboard)):
+    kb_dir = kb_path / keyboard
+    if kb_dir.exists():
         rules_mk = dict()
-        for directory in keyboard.split(os.path.sep):
-            kb_path = os.path.join(kb_path, directory)
-            rules_mk_path = os.path.join(kb_path, "rules.mk")
-            if os.path.exists(rules_mk_path):
+        for directory in Path(keyboard).parts:
+            kb_path = kb_path / directory
+            rules_mk_path = kb_path / "rules.mk"
+            if rules_mk_path.exists():
                 rules_mk = parse_rules_mk_file(rules_mk_path, rules_mk)
     else:
         raise NoSuchKeyboardError("The requested keyboard and/or revision does not exist.")