Don't install udev rules automatically

Alexander Bessman · bessman · commit 80f472051a88 · 2020-10-13T11:45:47.000+02:00
diff --git a/PSL/packet_handler.py b/PSL/packet_handler.py
@@ -8,6 +8,8 @@
 >>> device.disconnect()
 """
 import logging
+import os.path
+import platform
 import struct
 import time
 from functools import partial
@@ -42,6 +44,7 @@ def __init__(
         timeout: float = 1.0,
         **kwargs,  # Backward compatibility
     ):
+        self._check_udev()
         self.burst_buffer = b""
         self.load_burst = False
         self.input_queue_size = 0
@@ -71,6 +74,25 @@ def __init__(
         self.portname = self.interface.name
         self.listPorts = self._list_ports
 
+    @staticmethod
+    def _check_udev():
+        if platform.system() == "Linux":
+            udev_paths = [
+                "/run/udev/rules.d/",
+                "/etc/udev/rules.d/",
+                "/lib/udev/rules.d/",
+            ]
+            for p in udev_paths:
+                udev_rules = os.path.join(p, "99-pslab.rules")
+                if os.path.isfile(udev_rules):
+                    break
+            else:
+                e = (
+                    "A udev rule must be installed to access the PSLab. "
+                    + "Please copy 99-pslab.rules to /etc/udev/rules.d/."
+                )
+                raise OSError(e)
+
     @staticmethod
     def _list_ports() -> List[str]:  # Promote to public?
         """Return a list of serial port names."""
diff --git a/setup.py b/setup.py
@@ -1,85 +1,21 @@
-from distutils.cmd import Command
-from distutils.util import execute
-import os
-import platform
-import shutil
-from subprocess import call
-import warnings
+import setuptools
 
-from setuptools import setup, find_packages
-from setuptools.command.develop import develop
-from setuptools.command.install import install
 
+with open("README.md", "r") as fh:
+    long_description = fh.read()
 
-def udev_reload_rules():
-    call(["udevadm", "control", "--reload-rules"])
-
-
-def udev_trigger():
-    call(  # nosec
-        [
-            "udevadm",
-            "trigger",
-            "--subsystem-match=usb",
-            "--attr-match=idVendor=04d8",
-            "--action=add",
-        ]
-    )
-
-
-def install_udev_rules():
-    shutil.copy("99-pslab.rules", "/lib/udev/rules.d")
-    execute(udev_reload_rules, [], "Reloading udev rules")
-    execute(udev_trigger, [], "Triggering udev rules")
-
-
-def check_root():
-    return os.geteuid() == 0
-
-
-class CustomInstall(install):
-    def run(self):
-        install.run(self)
-        self.run_command("udev")
-
-
-class CustomDevelop(develop):
-    def run(self):
-        develop.run(self)
-        try:
-            self.run_command("udev")
-        except OSError as e:
-            warnings.warn(e)
-
-
-class InstallUdevRules(Command):
-    description = "install udev rules (requires root privileges)."
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        if platform.system() == "Linux":
-            if check_root():
-                install_udev_rules()
-            else:
-                msg = "You must have root privileges to install udev rules."
-                raise OSError(msg)
-
-
-setup(
-    name="PSL",
-    version="1.1.0",
+setuptools.setup(
+    name="pslab",
+    version="2.0.0.dev2",
     description="Pocket Science Lab by FOSSASIA",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     author="FOSSASIA PSLab Developers",
     author_email="pslab-fossasia@googlegroups.com",
     url="https://pslab.io/",
     install_requires=["numpy>=1.16.3", "pyserial>=3.4", "scipy>=1.3.0"],
-    packages=find_packages(exclude=("tests",)),
+    python_requires=">=3.6",
+    packages=setuptools.find_packages(exclude=("tests",)),
     package_data={
         "": [
             "*.css",
@@ -95,9 +31,10 @@ def run(self):
             "99-pslab.rules",
         ]
     },
-    cmdclass={
-        "develop": CustomDevelop,
-        "install": CustomInstall,
-        "udev": InstallUdevRules,
-    },
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "Operating System :: OS Independent",
+        "Development Status :: 4 - Beta",
+    ],
 )
