Improved imports as well as src-layout

.gitignore

@@ -1,12 +1,12 @@
 
-pixoo/__pycache__/
+src/pixoo/__pycache__/
 *.egg-info/
 dist/
 
-pixoo/configurations/__pycache__/
+src/pixoo/configurations/__pycache__/
 
-pixoo/constants/__pycache__/
+src/pixoo/constants/__pycache__/
 
-pixoo/enums/__pycache__/
+src/pixoo/enums/__pycache__/
 
-pixoo/objects/__pycache__/
+src/pixoo/objects/__pycache__/

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pixoo"
-version = "0.9.1"
+version = "0.9.2"
 authors = [
     { name = "Ron Talman", email = "[email protected]" },
 ]
@@ -22,5 +22,9 @@ dynamic = ['dependencies', 'keywords']
 Homepage = "https://github.com/SomethingWithComputers/pixoo"
 Issues = "https://github.com/SomethingWithComputers/pixoo/issues"
 
-[tool.setuptools.packages.find]
-where = ["pixoo"]
+#[tool.setuptools]
+#py-modules = ["__init__", "utilities"]
+#
+#[tool.setuptools.packages.find]
+#where = ["pixoo"]
+#namespaces = false

setup.py

@@ -8,15 +8,15 @@
 
 setup(
     name='pixoo',
-    version='0.9.1',
+    version='0.9.2',
     author='Ron Talman',
     description='A library to easily communicate with the Divoom Pixoo 64',
     license='CC BY-NC-SA',
     keywords=['pixoo', 'divoom', 'pixoo64'],
     long_description=(Path(__file__).parent / "README.md").read_text(),
     long_description_content_type='text/markdown',
     url='https://github.com/SomethingWithComputers/pixoo#readme',
-    packages=['pixoo'],
+    # packages=['pixoo'],
     project_urls={
         'Issue Tracker': 'https://github.com/SomethingWithComputers/pixoo/issues',
         'Source': 'https://github.com/SomethingWithComputers/pixoo'
@@ -26,6 +26,5 @@
         'requests ~= 2.32.3',
         'pillow ~= 10.4.0'
     ],
-    python_requires='>=3.10',
-    include_package_data=True
+    python_requires='>=3.10'
 )

pixoo/objects/pixoo.py → src/pixoo/objects/pixoo.py

@@ -4,12 +4,10 @@
 import requests
 from PIL import Image, ImageOps
 
-from pixoo.constants.font import retrieve_glyph
-from pixoo.enums.imageresamplemode import ImageResampleMode
-from pixoo.enums.textscrolldirection import TextScrollDirection
-from pixoo.objects.simulator import Simulator
-from pixoo.utilities import minimum_amount_of_steps, round_location, lerp_location, clamp_color, clamp, rgb_to_hex_color
-from .. import Palette, SimulatorConfiguration
+from .simulator import Simulator
+from .. import Palette, SimulatorConfiguration, ImageResampleMode, TextScrollDirection
+from ..constants.font import retrieve_glyph
+from ..utilities import minimum_amount_of_steps, round_location, lerp_location, clamp_color, rgb_to_hex_color, clamp
 
 
 class Pixoo:

pixoo/objects/pixoorest.py → src/pixoo/objects/pixoorest.py

@@ -1,9 +1,6 @@
 from flask import Flask, jsonify
 
-from pixoo.configurations.pixooconfiguration import PixooConfiguration
-from pixoo.configurations.restconfiguration import RESTConfiguration
-from pixoo.enums.textscrolldirection import TextScrollDirection
-from pixoo.objects.pixoo import Pixoo
+from .. import Pixoo, PixooConfiguration, RESTConfiguration, TextScrollDirection
 
 
 class PixooREST:

pixoo/objects/simulator.py → src/pixoo/objects/simulator.py

@@ -2,8 +2,7 @@
 
 from PIL import ImageTk, Image, ImageDraw
 
-from pixoo.configurations.simulatorconfiguration import SimulatorConfiguration
-from pixoo.constants.colors import Palette
+from .. import Palette
 
 
 class Simulator: