From 845c4443230d933069948b22bb076b42ba4c362a Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Wed, 24 Aug 2022 13:29:31 +0200
Subject: [PATCH] Python: Cleaned up the Python library

- both the library module and its packaging live in python-osd/
- fixed a typo
- added "import osd" to example usage
- added dependency on python-xlib
---
 python_client_lib.py => python-osd/osd/__init__.py       | 1 +
 {python_client_pip_package => python-osd}/pyproject.toml | 0
 {python_client_pip_package => python-osd}/setup.cfg      | 9 ++-------
 python_client_pip_package/src/osd/__init__.py            | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)
 rename python_client_lib.py => python-osd/osd/__init__.py (99%)
 rename {python_client_pip_package => python-osd}/pyproject.toml (100%)
 rename {python_client_pip_package => python-osd}/setup.cfg (84%)
 delete mode 120000 python_client_pip_package/src/osd/__init__.py

diff --git a/python_client_lib.py b/python-osd/osd/__init__.py
similarity index 99%
rename from python_client_lib.py
rename to python-osd/osd/__init__.py
index e6e94e8..492e47c 100755
--- a/python_client_lib.py
+++ b/python-osd/osd/__init__.py
@@ -7,6 +7,7 @@
 Basic usage:
 ============
 
+import osd
 osd.notify("first line", "second line")
 
 Each argument is either a single string (a notification line)
diff --git a/python_client_pip_package/pyproject.toml b/python-osd/pyproject.toml
similarity index 100%
rename from python_client_pip_package/pyproject.toml
rename to python-osd/pyproject.toml
diff --git a/python_client_pip_package/setup.cfg b/python-osd/setup.cfg
similarity index 84%
rename from python_client_pip_package/setup.cfg
rename to python-osd/setup.cfg
index fc3bb0a..496963c 100644
--- a/python_client_pip_package/setup.cfg
+++ b/python-osd/setup.cfg
@@ -3,7 +3,7 @@ name = osd
 version = 0.0.1
 author = Jiri Kalvoda
 author_email = jirikalvoda@kam.mff.cuni.cz
-description = On-Screen Disply Client
+description = On-Screen Display Client
 long_description_content_type = text/plain
 classifiers =
     Operating System :: OS Independent
@@ -14,18 +14,13 @@ classifiers =
     Programming Language :: Python :: 3.10
 
 [options]
-package_dir =
-    = src
 packages = osd
 python_requires = >=3.7
 zip_safe = False
 install_requires =
     argparse >= 0.21
     typing >= 3.0
-
-[options.packages.find]
-where = src
+    python-xlib
 
 [bdist_wheel]
 universal = 1
-
diff --git a/python_client_pip_package/src/osd/__init__.py b/python_client_pip_package/src/osd/__init__.py
deleted file mode 120000
index 91530bb..0000000
--- a/python_client_pip_package/src/osd/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../python_client_lib.py
\ No newline at end of file
-- 
2.39.2