kallithea Changeset - f644fc6bbfc3

Changeset - f644fc6bbfc3

Parent rev.

Child rev.

[Not reviewed]

default

1 2 0

Mads Kiilerich (mads) - 6 years ago 2020-04-23 22:22:48
mads@kiilerich.com

Grafted from: 4a52837ec0dd

tg: drop kallithea.config.environment - it doesn't do much and isn't a TG 2.4 convention

3 files changed with 3 insertions and 25 deletions:

kallithea/config/application.py

kallithea/config/environment.py

kallithea/tests/scripts/manual_test_concurrency.py

0 comments (0 inline, 0 general)

kallithea/config/application.py

➞

Show inline comments

@@ @@ -11,17 +11,17 @@ @@
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """WSGI middleware initialization for the Kallithea application."""
 from kallithea.config.app_cfg import base_config
 from kallithea.config.environment import load_environment
 __all__ = ['make_app']
 load_environment = base_config.make_load_environment()
 # Use base_config to setup the necessary PasteDeploy application factory.
 # make_base_app will wrap the TurboGears2 app with all the middleware it needs.
 make_base_app = base_config.setup_tg_wsgi_app(load_environment)
 def make_app(global_conf, full_stack=True, **app_conf):

kallithea/config/environment.py

➞

Show inline comments

deleted file

kallithea/tests/scripts/manual_test_concurrency.py

➞

Show inline comments

@@ @@ -34,23 +34,23 @@ import tempfile @@
 from os.path import dirname
 from subprocess import PIPE, Popen
 from paste.deploy import appconfig
 from sqlalchemy import engine_from_config
-from kallithea.config.environment import load_environment
+import kallithea.config.application
 from kallithea.lib.auth import get_crypt_password
 from kallithea.model import meta
 from kallithea.model.base import init_model
 from kallithea.model.db import Repository, Ui, User
 from kallithea.tests.base import HG_REPO, TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS
 rel_path = dirname(dirname(dirname(dirname(os.path.abspath(__file__)))))
 conf = appconfig('config:development.ini', relative_to=rel_path)
-load_environment(conf.global_conf, conf.local_conf)
+kallithea.config.application.make_app(conf.global_conf, **conf.local_conf)
 USER = TEST_USER_ADMIN_LOGIN
 PASS = TEST_USER_ADMIN_PASS
 HOST = 'server.local'
 METHOD = 'pull'
 DEBUG = True

0 comments (0 inline, 0 general)