From 0f750cfef7a3d720f3f68903730ca79f8e7a1412 Mon Sep 17 00:00:00 2001 From: Ron Talman Date: Sun, 18 Aug 2024 20:32:04 +0200 Subject: [PATCH] Improved imports as well as src-layout --- .gitignore | 10 +++++----- pyproject.toml | 10 +++++++--- setup.py | 7 +++---- {pixoo => src/pixoo}/__init__.py | 0 src/pixoo/configurations/__init__.py | 0 .../pixoo}/configurations/pixooconfiguration.py | 0 .../pixoo}/configurations/restconfiguration.py | 0 .../pixoo}/configurations/simulatorconfiguration.py | 0 src/pixoo/constants/__init__.py | 0 {pixoo => src/pixoo}/constants/colors.py | 0 {pixoo => src/pixoo}/constants/font.py | 0 src/pixoo/enums/__init__.py | 0 {pixoo => src/pixoo}/enums/channel.py | 0 {pixoo => src/pixoo}/enums/imageresamplemode.py | 0 {pixoo => src/pixoo}/enums/textscrolldirection.py | 0 src/pixoo/objects/__init__.py | 0 {pixoo => src/pixoo}/objects/pixoo.py | 10 ++++------ {pixoo => src/pixoo}/objects/pixoorest.py | 5 +---- {pixoo => src/pixoo}/objects/simulator.py | 3 +-- {pixoo => src/pixoo}/utilities.py | 0 20 files changed, 21 insertions(+), 24 deletions(-) rename {pixoo => src/pixoo}/__init__.py (100%) create mode 100644 src/pixoo/configurations/__init__.py rename {pixoo => src/pixoo}/configurations/pixooconfiguration.py (100%) rename {pixoo => src/pixoo}/configurations/restconfiguration.py (100%) rename {pixoo => src/pixoo}/configurations/simulatorconfiguration.py (100%) create mode 100644 src/pixoo/constants/__init__.py rename {pixoo => src/pixoo}/constants/colors.py (100%) rename {pixoo => src/pixoo}/constants/font.py (100%) create mode 100644 src/pixoo/enums/__init__.py rename {pixoo => src/pixoo}/enums/channel.py (100%) rename {pixoo => src/pixoo}/enums/imageresamplemode.py (100%) rename {pixoo => src/pixoo}/enums/textscrolldirection.py (100%) create mode 100644 src/pixoo/objects/__init__.py rename {pixoo => src/pixoo}/objects/pixoo.py (98%) rename {pixoo => src/pixoo}/objects/pixoorest.py (97%) rename {pixoo => src/pixoo}/objects/simulator.py (94%) rename {pixoo => src/pixoo}/utilities.py (100%) diff --git a/.gitignore b/.gitignore index 76f62c1..7d372b1 100644 --- a/.gitignore +++ b/.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__/ diff --git a/pyproject.toml b/pyproject.toml index 0b15ea9..366ddde 100644 --- a/pyproject.toml +++ b/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 = "ron@somethingwithcomputers.com" }, ] @@ -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"] \ No newline at end of file +#[tool.setuptools] +#py-modules = ["__init__", "utilities"] +# +#[tool.setuptools.packages.find] +#where = ["pixoo"] +#namespaces = false \ No newline at end of file diff --git a/setup.py b/setup.py index 76e73ba..5d5e39c 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ 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', @@ -16,7 +16,7 @@ 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' ) diff --git a/pixoo/__init__.py b/src/pixoo/__init__.py similarity index 100% rename from pixoo/__init__.py rename to src/pixoo/__init__.py diff --git a/src/pixoo/configurations/__init__.py b/src/pixoo/configurations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pixoo/configurations/pixooconfiguration.py b/src/pixoo/configurations/pixooconfiguration.py similarity index 100% rename from pixoo/configurations/pixooconfiguration.py rename to src/pixoo/configurations/pixooconfiguration.py diff --git a/pixoo/configurations/restconfiguration.py b/src/pixoo/configurations/restconfiguration.py similarity index 100% rename from pixoo/configurations/restconfiguration.py rename to src/pixoo/configurations/restconfiguration.py diff --git a/pixoo/configurations/simulatorconfiguration.py b/src/pixoo/configurations/simulatorconfiguration.py similarity index 100% rename from pixoo/configurations/simulatorconfiguration.py rename to src/pixoo/configurations/simulatorconfiguration.py diff --git a/src/pixoo/constants/__init__.py b/src/pixoo/constants/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pixoo/constants/colors.py b/src/pixoo/constants/colors.py similarity index 100% rename from pixoo/constants/colors.py rename to src/pixoo/constants/colors.py diff --git a/pixoo/constants/font.py b/src/pixoo/constants/font.py similarity index 100% rename from pixoo/constants/font.py rename to src/pixoo/constants/font.py diff --git a/src/pixoo/enums/__init__.py b/src/pixoo/enums/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pixoo/enums/channel.py b/src/pixoo/enums/channel.py similarity index 100% rename from pixoo/enums/channel.py rename to src/pixoo/enums/channel.py diff --git a/pixoo/enums/imageresamplemode.py b/src/pixoo/enums/imageresamplemode.py similarity index 100% rename from pixoo/enums/imageresamplemode.py rename to src/pixoo/enums/imageresamplemode.py diff --git a/pixoo/enums/textscrolldirection.py b/src/pixoo/enums/textscrolldirection.py similarity index 100% rename from pixoo/enums/textscrolldirection.py rename to src/pixoo/enums/textscrolldirection.py diff --git a/src/pixoo/objects/__init__.py b/src/pixoo/objects/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pixoo/objects/pixoo.py b/src/pixoo/objects/pixoo.py similarity index 98% rename from pixoo/objects/pixoo.py rename to src/pixoo/objects/pixoo.py index ea88feb..99fe57f 100644 --- a/pixoo/objects/pixoo.py +++ b/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: diff --git a/pixoo/objects/pixoorest.py b/src/pixoo/objects/pixoorest.py similarity index 97% rename from pixoo/objects/pixoorest.py rename to src/pixoo/objects/pixoorest.py index 2fd7d61..274c7b2 100644 --- a/pixoo/objects/pixoorest.py +++ b/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: diff --git a/pixoo/objects/simulator.py b/src/pixoo/objects/simulator.py similarity index 94% rename from pixoo/objects/simulator.py rename to src/pixoo/objects/simulator.py index 4357485..bb4e3a8 100644 --- a/pixoo/objects/simulator.py +++ b/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: diff --git a/pixoo/utilities.py b/src/pixoo/utilities.py similarity index 100% rename from pixoo/utilities.py rename to src/pixoo/utilities.py