kallithea Changeset - c677d5839bcc

Changeset - c677d5839bcc

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 7 years ago 2018-10-09 11:45:55
mads@kiilerich.com

make-config: tweak description - don't call it "bare" and don't reference setup-app

2 files changed with 11 insertions and 11 deletions:

kallithea/lib/paster_commands/make_config.py

kallithea/tests/base.py

0 comments (0 inline, 0 general)

kallithea/lib/paster_commands/make_config.py

➞

Show inline comments

@@ @@ -15,57 +15,60 @@ @@
 kallithea.lib.paster_commands.make_config
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 make-config gearbox command for Kallithea
 :license: GPLv3, see LICENSE.md for more details.
 """
 import os
 import sys
 import uuid
 import argparse
 from collections import defaultdict
 import mako.exceptions
 from kallithea.lib.paster_commands.common import BasePasterCommand
 from kallithea.lib import inifile
 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 ...
     def take_action(self, args):
         _run(args)
     def get_parser(self, prog_name):
         parser = super(Command, self).get_parser(prog_name)
         parser.add_argument('config_file', nargs='?',
             help='application config file to write')
         parser.add_argument('custom', nargs=argparse.REMAINDER,
             help='"key=value" for customizing the config file')
         parser.add_argument('--show-defaults', action='store_true',
             help="Show the default values that can be overridden")
         return parser
 def _run(args):
     if args.show_defaults:

kallithea/tests/base.py

➞

Show inline comments

@@ @@ -30,51 +30,48 @@ from kallithea.lib.utils2 import safe_st @@
 log = logging.getLogger(__name__)
 skipif = pytest.mark.skipif
 parametrize = pytest.mark.parametrize
 # Hack: These module global values MUST be set to actual values before running any tests. This is currently done by conftest.py.
 url = None
 testapp = None
 __all__ = [
     'skipif', 'parametrize', 'url', 'TestController',
     'ldap_lib_installed', 'pam_lib_installed', 'invalidate_all_caches',
     'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'NEW_HG_REPO', 'NEW_GIT_REPO',
     'HG_FORK', 'GIT_FORK', 'TEST_USER_ADMIN_LOGIN', 'TEST_USER_ADMIN_PASS',
     'TEST_USER_ADMIN_EMAIL', 'TEST_USER_REGULAR_LOGIN', 'TEST_USER_REGULAR_PASS',
     'TEST_USER_REGULAR_EMAIL', 'TEST_USER_REGULAR2_LOGIN',
     'TEST_USER_REGULAR2_PASS', 'TEST_USER_REGULAR2_EMAIL', 'TEST_HG_REPO',
     'TEST_HG_REPO_CLONE', 'TEST_HG_REPO_PULL', 'TEST_GIT_REPO',
     'TEST_GIT_REPO_CLONE', 'TEST_GIT_REPO_PULL', 'HG_REMOTE_REPO',
     '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-'))
 TEST_USER_ADMIN_LOGIN = 'test_admin'
 TEST_USER_ADMIN_PASS = 'test12'
 TEST_USER_ADMIN_EMAIL = 'test_admin@example.com'
 TEST_USER_REGULAR_LOGIN = 'test_regular'
 TEST_USER_REGULAR_PASS = 'test12'
 TEST_USER_REGULAR_EMAIL = 'test_regular@example.com'
 TEST_USER_REGULAR2_LOGIN = 'test_regular2'
 TEST_USER_REGULAR2_PASS = 'test12'
 TEST_USER_REGULAR2_EMAIL = 'test_regular2@example.com'
 HG_REPO = u'vcs_test_hg'
 GIT_REPO = u'vcs_test_git'
 NEW_HG_REPO = u'vcs_test_hg_new'
 NEW_GIT_REPO = u'vcs_test_git_new'
 HG_FORK = u'vcs_test_hg_fork'
 GIT_FORK = u'vcs_test_git_fork'

0 comments (0 inline, 0 general)