From 77214fa26b68ab193372a6d66f48199cf8945162 Mon Sep 17 00:00:00 2001 From: Edward Brown Date: Tue, 11 Nov 2025 09:03:09 +0000 Subject: [PATCH] Refactor setup.py to use fmtr.tools.Setup --- build.env | 9 +++++++++ pyproject.toml | 3 +++ setup.py | 46 ++++++++++------------------------------------ 3 files changed, 22 insertions(+), 36 deletions(-) create mode 100644 build.env create mode 100644 pyproject.toml diff --git a/build.env b/build.env new file mode 100644 index 0000000..8d30f31 --- /dev/null +++ b/build.env @@ -0,0 +1,9 @@ +CHANNEL="prod" +#ORG="fmtr" +PACKAGE="haco" +PORT="06" +BASE="python" +HOST="ws.lan" +COMPUTE="cpu" +EXTRAS="all" +#ENTRYPOINT="fmtr-dns-launch" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..c2d6e8d --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["fmtr.tools[setup,debug]"] +build-backend = "setuptools.build_meta" # \ No newline at end of file diff --git a/setup.py b/setup.py index 9a7171b..0d7ce36 100644 --- a/setup.py +++ b/setup.py @@ -1,40 +1,14 @@ -from pathlib import Path +from fmtr.tools import Setup -from setuptools import find_packages, setup - -packages = find_packages() -name = next(iter(packages)) -path_base = Path(__file__).absolute().parent -path = path_base / name / 'version' -__version__ = path.read_text().strip() - -setup( - long_description=(path_base / 'README.md').read_text(), - long_description_content_type='text/markdown', - name=name, - version=__version__, - url=f'https://fmtr.link/{name}', - license='Copyright © 2023 Frontmatter. All rights reserved.', - author='Frontmatter', +setup = Setup( + org=None, + dependencies=dict( + install=[ + 'fmtr.tools[version.dev,logging,sets,yaml,debug,caching,api]', + 'aiomqtt<2' + ] + ), description='Home Assistant Control Objects', keywords='homeassistant controls python tasmota', - packages=packages, - package_data={ - name: [f'version'], - }, - install_requires=[ - 'aiomqtt<2', - 'pyyaml', - 'requests' - ], - extras_require={ - 'tasmota': [ - - ] - }, - entry_points={ - 'console_scripts': [ - f'{name}-daemon = {name}.start:main', - ], - } + # url=f'https://fmtr.link/{name}', )