Fix name conflict for utils.py

Author: AgenttiX

.github/workflows/main.yml

@@ -62,7 +62,7 @@ jobs:
           pip --cache-dir=.pip install pylint
           pip --cache-dir=.pip install -r requirements.txt
       - name: Run Pylint
-        run: pylint startup tests f3.py kernel_remover.py maintenance.py modem.py utils.py 2>&1 | tee pylint.txt
+        run: pylint startup tests f3.py kernel_remover.py maintenance.py modem.py misc_misc_utils.py 2>&1 | tee pylint.txt
         working-directory: ${{ github.workspace }}
       - name: Upload results
         uses: actions/upload-artifact@v2

crypto/ethminer.py

@@ -18,7 +18,7 @@
 REPO_DIR = os.path.dirname(SCRIPT_DIR)
 LOG_DIR = os.path.join(REPO_DIR, "logs")
 sys.path.append(REPO_DIR)
-import utils
+import misc_utils as utils
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(

maintenance.py

@@ -12,8 +12,8 @@
 import time
 import typing as tp
 
-import utils
-from utils import print_info, run
+import misc_utils as utils
+from misc_utils import print_info, run
 
 log_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "logs")
 os.makedirs(log_path, exist_ok=True)

utils.py renamed to misc_utils.py

@@ -1,5 +1,7 @@
 """
 Utility methods for scripts
+
+This file cannot be named utils.py due to naming conflicts with installed packages.
 """
 
 import getpass

testing/f3.py

@@ -9,7 +9,7 @@
 import os.path
 import time
 
-import utils
+import misc_utils as utils
 
 logger = logging.getLogger(__name__)
 log_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "logs")

tests/test_utils.py

@@ -1,6 +1,6 @@
 import unittest
 
-import utils
+import misc_utils as utils
 
 
 class UtilsTestCase(unittest.TestCase):

wacom/install_wacom.sh

@@ -11,8 +11,8 @@ TABLET_USER="${USER}"
 
 sudo apt-get install python3-xlib
 echo "Installing the launcher."
-sudo cp ./99-wacom-tablet*.rules "/etc/udev/rules.d/"
-sudo cp "./wacom.sh" "/usr/local/bin/"
+sudo cp "${SCRIPT_DIR}"/99-wacom-tablet*.rules "/etc/udev/rules.d/"
+sudo cp "${SCRIPT_DIR}/wacom.sh" "/usr/local/bin/"
 sudo chown root:root /etc/udev/rules.d/99-wacom-tablet*.rules "/usr/local/bin/wacom.sh"
 sudo chmod 0644 /etc/udev/rules.d/99-wacom-tablet*.rules
 sudo chmod 0755 "/usr/local/bin/wacom.sh"
@@ -21,4 +21,5 @@ sudo chmod 0755 "/usr/local/bin/wacom.sh"
 sudo sed -i "s+USERNAME+${TABLET_USER}+g; s+SCRIPT_DIR+${SCRIPT_DIR}+g" "/usr/local/bin/wacom.sh"
 
 sudo udevadm control --reload-rules
+/usr/local/bin/wacom.sh
 echo "Launcher installed."

wacom/wacom.py

@@ -31,7 +31,7 @@
 REPO_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(REPO_DIR)
 
-import utils
+import misc_utils as utils
 
 XSETWACOM: str = "/usr/bin/xsetwacom"