chg: dev: refactor/update dependencies, cleanup tests and tox

* appdirs => platformdirs, minor refactor, daemonizer => 0.4.0

Signed-off-by: Stephen L Arnold <sarnold@vctlabs.com>

requirements.txt

@@ -1,4 +1,4 @@
 # daemon requirements, useful for tox/pip
-daemonizer @ git+https://github.com/sarnold/python-daemonizer.git@0.3.5#5f6bc3c80a90344b2c8e4cc24ed0b8c098a7af50; platform_system!="Windows"
+daemonizer @ git+https://github.com/sarnold/python-daemonizer.git@0.4.0#5e0fd72b9176fdcda8c9386f8b0905f2c434b61f; platform_system!="Windows"
 tftpy @ git+https://github.com/VCTLabs/tftpy.git@0.8.2.1#58d1f5c60af2e3759fbb137b89816954d8ea6bc9
-appdirs
+platformdirs

setup.cfg

@@ -34,8 +34,8 @@ keywords =
 [options]
 python_requires = >= 3.6
 install_requires =
-    appdirs
-    daemonizer @ git+https://github.com/sarnold/python-daemonizer.git@0.3.5#5f6bc3c80a90344b2c8e4cc24ed0b8c098a7af50
+    daemonizer @ git+https://github.com/sarnold/python-daemonizer.git@0.4.0#5e0fd72b9176fdcda8c9386f8b0905f2c434b61f
+    platformdirs
     tftpy @ git+https://github.com/VCTLabs/tftpy.git@0.8.2.1#58d1f5c60af2e3759fbb137b89816954d8ea6bc9
 
 packages = find_namespace:

src/pyserv/settings.py

@@ -6,7 +6,7 @@
 import sys
 from pathlib import Path
 
-from appdirs import AppDirs
+from platformdirs import PlatformDirs
 
 from ._version import __version__ as version
 
@@ -17,9 +17,9 @@ def get_userdirs():
 
     :return tuple: logdir, piddir, docdir as Path objs
     """
-    dirs = AppDirs(appname='pyserv', version=version)
-    logdir = Path(dirs.user_log_dir)
-    piddir = Path(dirs.user_cache_dir).joinpath('run')
+    dirs = PlatformDirs(appname='pyserv', appauthor='nerdboy')
+    logdir = dirs.user_log_path
+    piddir = dirs.user_runtime_path
     docdir = Path(os.getcwd())
     return logdir, piddir, docdir
 

tests/test_extras.py

@@ -27,11 +27,11 @@ def test_get_userdirs():
     if WIN32:
         assert logdir.name == 'Logs'
     elif APPLE:
-        assert logdir.name == version
+        assert logdir.name == 'pyserv'
     else:
         assert logdir.name == 'log'
 
-    assert piddir.name == 'run'
+    assert piddir.name == 'pyserv'
     assert docdir.name == Path.cwd().name
 
 

tests/test_serv.py

@@ -16,7 +16,6 @@
 iface = '127.0.0.1'
 port = 8000
 wport = 5000
-tport = 8069
 
 
 def get_request(port, iface):

tox.ini

@@ -219,7 +219,7 @@ commands =
     tail -n {env:TAIL} {env:LOG}
     cmp {env:TST_FILE} tests/{env:TST_FILE}
     ls -l {env:TST_FILE} tests/{env:TST_FILE}
-    bash -c 'rm -f $TST_FILE tests/$TST_FILE'
+    bash -c 'rm -f {env:TST_FILE} tests/{env:TST_FILE}'
 
 commands_post =
     tftpdaemon stop