changeset 6207:46db3368c2ae

lib: drop dbmigrate waitress check for Python 2.5 - we currently only support 2.6 and 2.7
author Mads Kiilerich <madski@unity3d.com>
date Mon, 12 Sep 2016 17:41:19 +0200
parents a9b9af11699e
children f4d128af1a01
files kallithea/config/environment.py kallithea/lib/db_manage.py kallithea/websetup.py
diffstat 3 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/config/environment.py	Mon Sep 12 17:41:19 2016 +0200
+++ b/kallithea/config/environment.py	Mon Sep 12 17:41:19 2016 +0200
@@ -105,7 +105,6 @@
         if test_index:
             create_test_index(TESTS_TMP_PATH, config, True)
 
-    DbManage.check_waitress()
     # MULTIPLE DB configs
     # Setup the SQLAlchemy database engine
     sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
--- a/kallithea/lib/db_manage.py	Mon Sep 12 17:41:19 2016 +0200
+++ b/kallithea/lib/db_manage.py	Mon Sep 12 17:41:19 2016 +0200
@@ -36,7 +36,6 @@
 import alembic.config
 import alembic.command
 
-from kallithea import __py_version__
 from kallithea.lib.paster_commands.common import ask_ok
 from kallithea.model.user import UserModel
 from kallithea.model import init_model
@@ -498,13 +497,3 @@
         """
         log.info('creating default user permissions')
         PermissionModel(self.sa).create_default_permissions(user=User.DEFAULT_USER)
-
-    @staticmethod
-    def check_waitress():
-        """
-        Function executed at the end of setup
-        """
-        if not __py_version__ >= (2, 6):
-            notify('Python2.5 detected, please switch '
-                   'egg:waitress#main -> egg:Paste#http '
-                   'in your .ini file')
--- a/kallithea/websetup.py	Mon Sep 12 17:41:19 2016 +0200
+++ b/kallithea/websetup.py	Mon Sep 12 17:41:19 2016 +0200
@@ -49,4 +49,3 @@
     dbmanage.populate_default_permissions()
     Session().commit()
     load_environment(conf.global_conf, conf.local_conf)
-    DbManage.check_waitress()