From 5d128d74f5a0625133f44d648e1ebf5590a5fb6b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 4 Apr 2024 21:30:20 +0200 Subject: [PATCH] netbrowse: migrate from setup.py to pyproject.toml This change also requires another restructure for netbrowse itself, hence the relocation of files in the tree. Signed-off-by: Joachim Wiberg --- src/netbrowse/MANIFEST.in | 4 +++ src/netbrowse/netbrowse/__init__.py | 0 .../{ => netbrowse}/avahi_alias/__init__.py | 0 .../avahi_alias/avahi_alias.py | 0 .../{ => netbrowse}/mdns_hosts/__init__.py | 0 .../{ => netbrowse}/mdns_hosts/mdns_hosts.py | 0 .../{netbrowse => netbrowse/netbrowse.py} | 6 +++- .../{ => netbrowse/static}/favicon.ico | Bin .../static/images/2533758_8245.svg | 0 .../{ => netbrowse}/static/images/switch.png | Bin .../{ => netbrowse}/templates/browse.html | 0 src/netbrowse/pyproject.toml | 29 ++++++++++++++++++ src/netbrowse/setup.cfg | 5 --- src/netbrowse/setup.py | 10 ------ 14 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 src/netbrowse/MANIFEST.in create mode 100644 src/netbrowse/netbrowse/__init__.py rename src/netbrowse/{ => netbrowse}/avahi_alias/__init__.py (100%) rename src/netbrowse/{ => netbrowse}/avahi_alias/avahi_alias.py (100%) rename src/netbrowse/{ => netbrowse}/mdns_hosts/__init__.py (100%) rename src/netbrowse/{ => netbrowse}/mdns_hosts/mdns_hosts.py (100%) rename src/netbrowse/{netbrowse => netbrowse/netbrowse.py} (88%) rename src/netbrowse/{ => netbrowse/static}/favicon.ico (100%) rename src/netbrowse/{ => netbrowse}/static/images/2533758_8245.svg (100%) rename src/netbrowse/{ => netbrowse}/static/images/switch.png (100%) rename src/netbrowse/{ => netbrowse}/templates/browse.html (100%) create mode 100644 src/netbrowse/pyproject.toml delete mode 100644 src/netbrowse/setup.cfg delete mode 100644 src/netbrowse/setup.py diff --git a/src/netbrowse/MANIFEST.in b/src/netbrowse/MANIFEST.in new file mode 100644 index 00000000..9dbef6c6 --- /dev/null +++ b/src/netbrowse/MANIFEST.in @@ -0,0 +1,4 @@ +include LICENSE +include README.md +recursive-include netbrowse/templates * +recursive-include netbrowse/static * diff --git a/src/netbrowse/netbrowse/__init__.py b/src/netbrowse/netbrowse/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/netbrowse/avahi_alias/__init__.py b/src/netbrowse/netbrowse/avahi_alias/__init__.py similarity index 100% rename from src/netbrowse/avahi_alias/__init__.py rename to src/netbrowse/netbrowse/avahi_alias/__init__.py diff --git a/src/netbrowse/avahi_alias/avahi_alias.py b/src/netbrowse/netbrowse/avahi_alias/avahi_alias.py similarity index 100% rename from src/netbrowse/avahi_alias/avahi_alias.py rename to src/netbrowse/netbrowse/avahi_alias/avahi_alias.py diff --git a/src/netbrowse/mdns_hosts/__init__.py b/src/netbrowse/netbrowse/mdns_hosts/__init__.py similarity index 100% rename from src/netbrowse/mdns_hosts/__init__.py rename to src/netbrowse/netbrowse/mdns_hosts/__init__.py diff --git a/src/netbrowse/mdns_hosts/mdns_hosts.py b/src/netbrowse/netbrowse/mdns_hosts/mdns_hosts.py similarity index 100% rename from src/netbrowse/mdns_hosts/mdns_hosts.py rename to src/netbrowse/netbrowse/mdns_hosts/mdns_hosts.py diff --git a/src/netbrowse/netbrowse b/src/netbrowse/netbrowse/netbrowse.py similarity index 88% rename from src/netbrowse/netbrowse rename to src/netbrowse/netbrowse/netbrowse.py index f06e1cca..a0cc8788 100755 --- a/src/netbrowse/netbrowse +++ b/src/netbrowse/netbrowse/netbrowse.py @@ -22,7 +22,8 @@ def browse(): return render_template('browse.html', hosts_services=hosts_services) -if __name__ == '__main__': +def main(): + """Main entrypoint, advertises aliases from command line and starts browser.""" avahi_aliases = AvahiAlias() for each in sys.argv[1:]: avahi_aliases.publish_cname(str(each).encode("utf-8", "strict")) @@ -31,3 +32,6 @@ if __name__ == '__main__': app.run(debug=True) except KeyboardInterrupt: print("Exiting") + +if __name__ == '__main__': + main() diff --git a/src/netbrowse/favicon.ico b/src/netbrowse/netbrowse/static/favicon.ico similarity index 100% rename from src/netbrowse/favicon.ico rename to src/netbrowse/netbrowse/static/favicon.ico diff --git a/src/netbrowse/static/images/2533758_8245.svg b/src/netbrowse/netbrowse/static/images/2533758_8245.svg similarity index 100% rename from src/netbrowse/static/images/2533758_8245.svg rename to src/netbrowse/netbrowse/static/images/2533758_8245.svg diff --git a/src/netbrowse/static/images/switch.png b/src/netbrowse/netbrowse/static/images/switch.png similarity index 100% rename from src/netbrowse/static/images/switch.png rename to src/netbrowse/netbrowse/static/images/switch.png diff --git a/src/netbrowse/templates/browse.html b/src/netbrowse/netbrowse/templates/browse.html similarity index 100% rename from src/netbrowse/templates/browse.html rename to src/netbrowse/netbrowse/templates/browse.html diff --git a/src/netbrowse/pyproject.toml b/src/netbrowse/pyproject.toml new file mode 100644 index 00000000..fc502082 --- /dev/null +++ b/src/netbrowse/pyproject.toml @@ -0,0 +1,29 @@ +[build-system] +requires = ["setuptools>=42", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "netbrowse" +version = "1.0" +description = "mDNS-SD browser" +authors = [{name = "Joachim Wiberg", email = "troglobit@gmail.com"}] +license = {file = "LICENSE"} +readme = "README.md" +dependencies = [ + "flask", +] + +[project.optional-dependencies] +dev = [ + "pytest>=6.0", + "flake8>=3.8", +] + +[tool.setuptools.packages.find] +where = ["netbrowse", "netbrowse.avahi_alias", "netbrowse.mdns_hosts"] + +[tool.setuptools.package-data] +netbrowse = ["templates/*.html", "static/*"] + +[project.scripts] +netbrowse = "netbrowse.netbrowse:main" diff --git a/src/netbrowse/setup.cfg b/src/netbrowse/setup.cfg deleted file mode 100644 index 488cd068..00000000 --- a/src/netbrowse/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[metadata] -name = Network Browser -description = An mDNS CNAME advertiser over D-Bus and mDNS Browser (fcgi) -version = 1.0 -license_files = LICENSE diff --git a/src/netbrowse/setup.py b/src/netbrowse/setup.py deleted file mode 100644 index 0403ad61..00000000 --- a/src/netbrowse/setup.py +++ /dev/null @@ -1,10 +0,0 @@ -from setuptools import setup, find_packages - -setup( - packages=find_packages(), - scripts=['netbrowse'], - install_requires=[ - 'dbus-python', - 'flup' - ], -)