From 7943fd98469e9ffc8758c16a30000036f29d5aa2 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Sat, 9 Dec 2023 16:49:36 +0100 Subject: [PATCH] See if we can start fixing stdeb as well --- .gitignore | 1 + main.py | 2 +- setup.py | 52 +++++++++++++++++++++++++++++----------------------- stdeb.cfg | 4 ++-- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index fe130d3..6998459 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ __pycache__/ .buildozer/ bin/ +deb_dist/ # C extensions *.so diff --git a/main.py b/main.py index 1bb82d1..7b2184b 100755 --- a/main.py +++ b/main.py @@ -12,7 +12,7 @@ from kivy.uix.popup import Popup from kivy.uix.screenmanager import Screen, ScreenManager from kivy.uix.stacklayout import StackLayout -from src.tinge import HueBridge, HueGroup, HueUtils, Tinge +from tinge import HueBridge, HueGroup, HueUtils, Tinge class HueApp(App): diff --git a/setup.py b/setup.py index 88dae7c..a1d8d77 100644 --- a/setup.py +++ b/setup.py @@ -3,26 +3,32 @@ import setuptools with open("README.md", "r", encoding="utf-8") as fh: long_description = fh.read() -setuptools.setup( - name="tinge", - version="0.0.3", - author="Micke Nordin", - author_email="hej@mic.ke", - data_files = [('share/applications', ['data/org.smolnet.tinge.desktop']),('share/icons/hicolor/scalable/apps',['data/org.smolnet.tinge.svg']),], - description="A GUI for Philips Hue lights.", - long_description=long_description, - long_description_content_type="text/markdown", - url="https://code.smolnet.org/micke/tinge", - project_urls={ - "Bug Tracker": "https://code.smolnet.org/micke/tinge/issues", - }, - classifiers=[ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: GPL-3.0", - "Operating System :: OS Independent", - ], - package_dir={"": "src"}, - packages=setuptools.find_packages(where="src"), - python_requires=">=3.9", - scripts=["scripts/tinge"], -) +setuptools.setup(name="tinge", + version="0.0.3", + author="Micke Nordin", + author_email="hej@mic.ke", + data_files=[ + ('share/applications', ['data/org.smolnet.tinge.desktop' + ]), + ('share/icons/hicolor/scalable/apps', + ['data/org.smolnet.tinge.svg']), + ], + description="A GUI for Philips Hue lights.", + long_description=long_description, + long_description_content_type="text/markdown", + url="https://code.smolnet.org/micke/tinge", + project_urls={ + "Bug Tracker": + "https://code.smolnet.org/micke/tinge/issues", + }, + classifiers=[ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: GPL-3.0", + "Operating System :: OS Independent", + ], + package_dir={"": "src"}, + packages=setuptools.find_packages(where="src"), + python_requires=">=3.9", + entry_points={'gui_scripts': [ + 'tinge = main:main', + ]}) diff --git a/stdeb.cfg b/stdeb.cfg index 463c411..ae585b7 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,3 +1,3 @@ [DEFAULT] -Depends3: python3-upnpy, python3-wxgtk4.0, python3-toml, python3-requests -Debian-Version: 2 +Depends3: python3-upnpy, python3-kivy, python3-toml, python3-requests +Debian-Version: 1