[setup] updated package setup

MANIFEST.in

-include bin/vispa
-include bin/vispad
-include conf/*.sample
-recursive-include alembic *
-recursive-exclude alembic *.pyc
-recursive-include vispa *
-recursive-exclude vispa *.pyc
-include license.txt

requirements.txt

-cherrypy
-paramiko
-rpyc
-mako
-sqlalchemy>=0.9.0
-alembic>=0.7.3
-passlib
-ws4py
-sphinx==1.4.6

setup.py

@@ -2,60 +2,42 @@
 # -*- coding: utf-8 -*-
 
 
-from setuptools import setup
-import os
-
-ignore_extensions = [".py", ".pyc", ".pyo", ".orig"]
-files = []
-packages = []
-
-srcdir = os.path.dirname(os.path.abspath(__file__))
-
-for wroot, wdirs, wfiles in os.walk("vispa"):
-    for name in wfiles:
-        if name == "__init__.py":
-            packages.append(wroot.replace(os.sep, ".").strip(". \t\n\r"))
-        base, ext = os.path.splitext(name)
-        if ext not in ignore_extensions:
-            files.append(os.path.join(wroot[6:], name))
-
-versions_path = os.path.join("vispa", "models", "alembic", "versions")
-for wroot, wdirs, wfiles in os.walk(versions_path):
-    for name in wfiles:
-        if name.endswith(".py"):
-            files.append(os.path.join(wroot[6:], name))
+from setuptools import setup, find_packages, findall
 
 # http://stackoverflow.com/a/24517154
-version_ns = {}
-version_path = os.path.join(srcdir, 'vispa', 'version.py')
-with open(version_path) as version_file:
-    exec(version_file.read(), version_ns)
+metadata = {}
+execfile("vispa/version.py", metadata)
 
 setup(
     name="vispa",
-    version=version_ns['__version__'],
+    version=metadata['__version__'],
     description="VISPA - Integrated Development Environment for Physicists",
     author="VISPA Project",
     author_email="vispa@lists.rwth-aachen.de",
     url="http://vispa.physik.rwth-aachen.de/",
     license="GNU GPL v2",
-    packages=packages,
-    package_data={"vispa": files},
-    scripts=[os.path.join(srcdir, 'bin', 'vispa'), os.path.join(srcdir, 'bin', 'vispad'), os.path.join(srcdir, 'bin', 'vispa-ldap-export')],
+    packages=find_packages(),
+    package_data={
+        "vispa": [
+            path.split("/", 1)[-1]
+            for path in findall("vispa")
+            if "/static/" in path
+            or "/templates/" in path
+            or "/models/alembic/versions/" in path
+        ]
+    },
+    scripts=findall("bin"),
     install_requires=[
         "sqlalchemy >= 0.9.0",
         "mako",
-        "cherrypy<9.0.0", # cherrypy removed wsgiserver, see https://github.com/Lawouach/WebSocket-for-Python/issues/205
+        "cherrypy >= 10.1",
         "paramiko",
-        "rpyc>3.3.0", 
+        "rpyc >= 4",
         "alembic >= 0.7.3",  # for Operations.batch_alter_table
         "passlib",
         "ws4py",
         "ldap3"
     ],
-    dependency_links=[
-      'https://github.com/geromueller/rpyc/archive/master.zip#egg=rpyc-3.4.0',
-    ],
     extras_require={"doc": ["sphinx", "sphinx-bootstrap-theme"]},
     classifiers=[
         "Development Status :: 5 - Production/Stable",

vispa/server.py

@@ -146,8 +146,9 @@ class Server(object):
         'server.request_queue_size': 10,
         'server.thread_pool': 10,
         'engine.autoreload.on': False,
-        'engine.timeout_monitor.on': False,
     }
+    if hasattr(cherrypy, "TimeoutError"):
+        __default_server_config['engine.timeout_monitor.on'] = False
 
     @property
     def __default_mount_config(self):