rename parsers, better journald integration

diff --git a/setup.py b/setup.py
index 7dd8d3e8f1a94d2746ee180e889d24a3b028081f..8d246586d46a6fc142b99b1ade492eeac8e71220 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+import setuptools
 from os import path
 
 # Import main module so we can set the version
@@ -11,9 +11,9 @@ __version__ = logparse.__version__
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
-setup(
+setuptools.setup(
     name='logparse',                    # https://packaging.python.org/specifications/core-metadata/#name
-    version=logparse.__version__,       # https://www.python.org/dev/peps/pep-0440/   https://packaging.python.org/en/latest/single_source_version.html
+    version=__version__,       # https://www.python.org/dev/peps/pep-0440/   https://packaging.python.org/en/latest/single_source_version.html
     description='Summarise server logs',
     long_description_content_type='text/markdown',
     url='https://git.lorimer.id.au/logparse.git',
@@ -29,8 +29,8 @@ setup(
     keywords='logparse log parse analysis summary monitor email server',
     packages=['logparse', 'logparse.parsers'],
     python_requires='>=3',              # https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires
-    install_requires=['premailer', 'requests', 'tabulate'],   # https://packaging.python.org/en/latest/requirements.html
-    data_files=[('/etc/logparse', ['logparse.conf', 'header.html', 'main.css'])],   # installed to /etc/logparse
+    install_requires=['premailer', 'requests', 'tabulate', 'sensors.py', 'systemd-python'],   # https://packaging.python.org/en/latest/requirements.html
+    data_files=[('/etc/logparse', ['logparse.conf', 'header.html', 'main.css']), ('man/man8', ['doc/build/man/logparse.8'])],
     project_urls={
         'Readme': 'https://git.lorimer.id.au/logparse.git/about',
         'Source': 'https://git.lorimer.id.au/logparse.git',