changeset 7387:c677d5839bcc

make-config: tweak description - don't call it "bare" and don't reference setup-app
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 09 Oct 2018 11:45:55 +0200
parents e885a8efef34
children b1652bba9ecc
files kallithea/lib/paster_commands/make_config.py kallithea/tests/base.py
diffstat 2 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/paster_commands/make_config.py	Sun Sep 30 18:31:37 2018 +0200
+++ b/kallithea/lib/paster_commands/make_config.py	Tue Oct 09 11:45:55 2018 +0200
@@ -36,15 +36,18 @@
 class Command(BasePasterCommand):
     """Kallithea: Create a new config file
 
-    make-config is part of a two-phase installation process (the
-    second phase is setup-app). make-config creates a bare configuration
-    file (possibly filling in defaults from the extra
-    variables you give).
+    make-config is the first part of the two step setup process. This first
+    step creates a customized .ini configuration file. The next step is to run
+    setup-db to populate the database that is referenced in the configuration
+    file.
 
-    The first key=value arguments are used to customize the Mako variables from
-    what is shown with --show-defaults. Any following key=value arguments will be
-    patched/inserted in the [app:main] section ... until another section name
-    is specified and change where the following values go.
+    The primary high level configuration keys and their default values are
+    shown with --show-defaults . Custom values can be specified on the command
+    line as key=value arguments when creating a config file.
+
+    Additional key=value arguments will be patched/inserted in the [app:main]
+    section ... until another section name specifies where any following values
+    should go.
     """
 
     takes_config_file = False # at least not an existing one ...
--- a/kallithea/tests/base.py	Sun Sep 30 18:31:37 2018 +0200
+++ b/kallithea/tests/base.py	Tue Oct 09 11:45:55 2018 +0200
@@ -51,9 +51,6 @@
     'GIT_REMOTE_REPO', 'HG_TEST_REVISION', 'GIT_TEST_REVISION',
 ]
 
-# Invoke websetup with the current config file
-# SetupCommand('setup-app').run([config_file])
-
 ## SOME GLOBALS FOR TESTS
 
 TESTS_TMP_PATH = os.environ.get('KALLITHEA_TESTS_TMP_PATH', tempfile.mkdtemp(prefix='kallithea-test-'))