Merge pull request #97 from robberwick/reconfigure-package-exports

refactor: Reconfigure package imports

pyproject.toml

@@ -21,7 +21,7 @@ dev = ["black", "isort"]
 test = ["coverage", "pytest", "pytest-cov", "pytest-mock"]
 
 [project.scripts]
-blinkstick = "blinkstick:main"
+blinkstick = "blinkstick.main:main"
 
 [project.urls]
 homepage = "https://pypi.python.org/pypi/blinkstick/"

src/blinkstick/__init__.py

@@ -1,6 +1,11 @@
-from .main import main
 from importlib.metadata import version, PackageNotFoundError
 
+from .blinkstick import BlinkStick, BlinkStickPro, BlinkStickProMatrix
+from .blinkstick import find_all, find_by_serial, find_first, get_blinkstick_package_version
+from .colors import Color, ColorFormat
+from .constants import BlinkStickVariant
+from .exceptions import BlinkStickException
+
 try:
     __version__ = version("blinkstick")
 except PackageNotFoundError:

src/blinkstick/main.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
 from optparse import OptionParser, IndentedHelpFormatter, OptionGroup
-from blinkstick import blinkstick
-from blinkstick.constants import BlinkStickVariant
 import textwrap
 import sys
 import logging
+
+from .blinkstick import get_blinkstick_package_version, find_all, find_by_serial
+from .constants import BlinkStickVariant
 logging.basicConfig()
 
 
@@ -71,7 +72,7 @@ def format_option(self, option):
 
     def format_usage(self, usage):
         return "BlinkStick control script %s\n(c) Agile Innovative Ltd 2013-2014\n\n%s" % (
-        blinkstick.get_blinkstick_package_version(), IndentedHelpFormatter.format_usage(self, usage))
+        get_blinkstick_package_version(), IndentedHelpFormatter.format_usage(self, usage))
 
 
 def print_info(stick):
@@ -217,9 +218,9 @@ def main():
     (options, args) = parser.parse_args()
 
     if options.serial is None:
-        sticks = blinkstick.find_all()
+        sticks = find_all()
     else:
-        sticks = [blinkstick.find_by_serial(options.serial)]
+        sticks = [find_by_serial(options.serial)]
 
         if len(sticks) == 0:
             print("BlinkStick with serial number " + options.backend + " not found...")