More pip support.

Author: suurjaak

MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include inputscope *.py *.tpl *.db *.css *.ico *.js *.svg
+include LICENSE.md README.md requirements.txt

inputscope/__init__.py

@@ -0,0 +1,3 @@
+import conf
+__version__ = conf.Version
+__VERSION__ = conf.Version

inputscope/__main__.py

@@ -0,0 +1,5 @@
+"""Package entry point."""
+from inputscope import main
+
+if "__main__" == __name__:
+    main.main()

inputscope/listener.py

@@ -229,4 +229,4 @@ def main():
 
 
 if "__main__" == __name__:
-    main()
+    main()

inputscope/main.py

@@ -250,7 +250,6 @@ def start_listener(inqueue, outqueue):
 
 def main():
     """Entry point for stand-alone execution."""
-    multiprocessing.freeze_support()
     conf.init()
     db.init(conf.DbPath, conf.DbStatements)
 
@@ -272,4 +271,5 @@ def main():
 
 
 if "__main__" == __name__:
+    multiprocessing.freeze_support()
     main()

inputscope/webui.py

@@ -204,7 +204,7 @@ def start():
 
 def main():
     """Entry point for stand-alone execution."""
-    conf.WebAutoReload, conf.WebQuiet = True, False
+    conf.WebQuiet = False
     start()
 
 

setup.py

@@ -26,9 +26,9 @@
     keywords="mouse keyboard logging heatmap",
 
     install_requires=["bottle", "PyUserInput"],
-    entry_points={"gui_scripts": ["inputscope = inputscope.main:run"]},
-    entry_points={"console_scripts": ["inputscope-listener = listener.main:run"],
-                                     ["inputscope-webui = webui.main:run"]},
+    entry_points={"gui_scripts": ["inputscope = inputscope.main:main"],
+                  "console_scripts": ["inputscope-listener = inputscope.listener:main",
+                                      "inputscope-webui = inputscope.webui:main"]},
 
     packages=setuptools.find_packages(),
     include_package_data=True, # Use MANIFEST.in for data files