From ff4ed23325a72a5472dc8f80a3abe27d794f69f4 Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sat, 25 Jun 2022 17:51:04 +0200 Subject: [PATCH] Executable added --- pyproject.toml | 3 +++ src/projectorpi/__init__.py | 0 __main__.py => src/projectorpi/cli.py | 6 +++--- extron.py => src/projectorpi/extron.py | 2 +- projector.py => src/projectorpi/projector.py | 2 +- serialdevice.py => src/projectorpi/serialdevice.py | 0 6 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 src/projectorpi/__init__.py rename __main__.py => src/projectorpi/cli.py (90%) rename extron.py => src/projectorpi/extron.py (98%) rename projector.py => src/projectorpi/projector.py (94%) rename serialdevice.py => src/projectorpi/serialdevice.py (100%) diff --git a/pyproject.toml b/pyproject.toml index ac860b9..8e772fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,6 +4,9 @@ version = "0.1.0" description = "" authors = ["Marijn Doeve "] +[tool.poetry.scripts] +projectorpi = "projectorpi.cli:main" + [tool.poetry.dependencies] python = "^3.9" pyserial = "^3.5" diff --git a/src/projectorpi/__init__.py b/src/projectorpi/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/__main__.py b/src/projectorpi/cli.py similarity index 90% rename from __main__.py rename to src/projectorpi/cli.py index 78a2c2f..6d4c4fb 100755 --- a/__main__.py +++ b/src/projectorpi/cli.py @@ -1,12 +1,12 @@ #! /usr/bin/env python3 from argparse import ArgumentParser -from projector import ProjectorSerial -from extron import ExtronSerial +from .projector import ProjectorSerial +from .extron import ExtronSerial verbose = False -if __name__ == "__main__": +def main(): parser = ArgumentParser( prog="projectorpi", description="A tool that turns the projector on and off." ) diff --git a/extron.py b/src/projectorpi/extron.py similarity index 98% rename from extron.py rename to src/projectorpi/extron.py index c0a8830..22fe68e 100644 --- a/extron.py +++ b/src/projectorpi/extron.py @@ -2,7 +2,7 @@ # | == carriage return from types import LambdaType from typing import Callable -from serialdevice import SerialDevice +from .serialdevice import SerialDevice # \x1b == ESC C: Callable[[str], str] = lambda command: f"\x1b{command}\r" diff --git a/projector.py b/src/projectorpi/projector.py similarity index 94% rename from projector.py rename to src/projectorpi/projector.py index 79a9c9e..50264ba 100644 --- a/projector.py +++ b/src/projectorpi/projector.py @@ -1,4 +1,4 @@ -from serialdevice import SerialDevice +from .serialdevice import SerialDevice STX = chr(0x02) ETX = chr(0x03) diff --git a/serialdevice.py b/src/projectorpi/serialdevice.py similarity index 100% rename from serialdevice.py rename to src/projectorpi/serialdevice.py