* get rid of deprecated sklearn package

* Update to tltk 1.8 * therefore call this version 1.2.0
giggls · Jan 14, 2024 · 8e3004b · 8e3004b
1 parent 6fad88a
commit 8e3004b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -20,7 +20,7 @@ apt install libunac1-dev luarocks lua5.3 liblua5.3-dev build-essential debhelper
 ### Python
 
 ```
-apt install python3-venv python3-sdnotify python3-shapely libicu-dev libpython3-dev
+apt install python3-venv libicu-dev libpython3-dev
 ```
 
 ## Installation

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+osml10n (1.2.0) unstable; urgency=medium
+
+  * get rid of deprecated sklearn package
+  * Update to tltk 1.8
+
+ -- Sven Geggus <sven-debian@geggus.net>  Sun, 14 Jan 2024 13:17:08 +0100
+
 osml10n (1.1.1) unstable; urgency=medium
 
   * Fix python installation

diff --git a/deps/sklearn-0.0.post9.tar.gz b/deps/sklearn-0.0.post9.tar.gz
diff --git a/setup.py b/setup.py
@@ -21,15 +21,15 @@
     name='osml10n',
     version=vers,
     install_requires=[
-        f"sklearn @ file://localhost/{PROJECT_DIR}/deps/sklearn-0.0.post9.tar.gz",
-        "scikit-learn == 1.3.0", 
+        "scikit-learn == 1.3.2", 
         "pykakasi == 2.2.1",
-        "tltk == 1.6.8",
+        "tltk == 1.8.0",
         "pinyin_jyutping_sentence == 1.3",
         "pyicu",
         "shapely",
         "sdnotify",
-        "requests"
+        "requests",
+        "pandas"
     ],
     scripts = [ "transcription-daemon/geo-transcript-srv.py", "transcription-cli/transcribe.py" ],
     packages = [ "osml10n" ],

diff --git a/transcription-daemon/geo-transcript-srv.py b/transcription-daemon/geo-transcript-srv.py
@@ -11,6 +11,7 @@
 import struct
 import sys
 import pkg_resources
+from importlib.metadata import version
 
 # as imports are very slow parse arguments first
 parser = argparse.ArgumentParser(description='Server for transcription of names based on geolocation')
@@ -31,6 +32,8 @@ def vout(msg):
   vers='version '+pkg_resources.require("osml10n")[0].version
 except:
   vers='uninstalled version'
+  if (args.geomdir == None):
+    args.geomdir = os.path.join('osml10n','boundaries')
 
 sys.stdout.write("Loading osml10n transcription server (%s): " % vers)
 sys.stdout.flush()
@@ -290,7 +293,7 @@ async def main():
     await server.serve_forever()
 
 if __name__ == "__main__":
-  sys.stdout.write("ready.\n")
+  sys.stdout.write("ready.\n(using pykakasi "+version('pykakasi')+', '+"tltk "+version('tltk')+', '+"pinyin_jyutping_sentence "+version('pinyin_jyutping_sentence')+')\n')
   if args.sdnotify:
     import sdnotify
     sdnotify.SystemdNotifier().notify("READY=1")