kallithea Changeset - 495dea7c2a13

Changeset - 495dea7c2a13

Parent rev.

Child rev.

[Not reviewed]

default

1 3 1

Thomas De Schampheleire - 5 years ago 2020-10-06 20:18:40
thomas.de_schampheleire@nokia.com

ini: get rid of path 'paster_commands'

We are no longer using 'paster'. The location of the template.ini.make file
is a leftover from old times.

4 files changed with 2 insertions and 3 deletions:

MANIFEST.in

kallithea/lib/inifile.py

kallithea/templates/ini/template.ini.mako

rename

scripts/generate-ini.py

0 comments (0 inline, 0 general)

MANIFEST.in

➞

Show inline comments

 include           .coveragerc
 include           .eslintrc.js
 include           Apache-License-2.0.txt
 include           CONTRIBUTORS
 include           COPYING
 include           Jenkinsfile
 include           LICENSE-MERGELY.html
 include           LICENSE.md
 include           MIT-Permissive-License.txt
 include           README.rst
 include           conftest.py
 include           dev_requirements.txt
 include           development.ini
 include           pytest.ini
 include           requirements.txt
 include           tox.ini
 recursive-include docs *
 recursive-include init.d *
 recursive-include kallithea/alembic *
 include           kallithea/bin/ldap_sync.conf
 include           kallithea/lib/paster_commands/template.ini.mako
 recursive-include kallithea/front-end *
 recursive-include kallithea/i18n *
 recursive-include kallithea/public *
 recursive-include kallithea/templates *
 recursive-include kallithea/tests/fixtures *
 recursive-include kallithea/tests/scripts *
 include           kallithea/tests/models/test_dump_html_mails.ref.html
 include           kallithea/tests/performance/test_vcs.py
 include           kallithea/tests/vcs/aconfig
 recursive-include scripts *

kallithea/lib/inifile.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 kallithea.lib.inifile
 ~~~~~~~~~~~~~~~~~~~~~
 Handling of .ini files, mainly creating them from Mako templates and adding
 other custom values.
 """
 import logging
 import os
 import re
 import mako.template
 log = logging.getLogger(__name__)
 template_file = os.path.join(
     os.path.dirname(os.path.dirname(os.path.dirname(__file__))),
-    'kallithea/lib/paster_commands/template.ini.mako')
+    'kallithea/templates/ini/template.ini.mako')
 default_variables = {
     'database_engine': 'sqlite',
     'http_server': 'waitress',
     'host': '127.0.0.1',
     'port': '5000',
     'uuid': lambda: 'VERY-SECRET',
     'version': '',
+}
 variable_options = {
     'database_engine': ['sqlite', 'postgres', 'mysql'],
     'http_server': ['waitress', 'gearbox', 'gevent', 'gunicorn', 'uwsgi'],
+}
 def expand(template, mako_variable_values, settings):
     """Expand mako template and tweak it.
     Not entirely stable for random templates as input, but good enough for our
     single template.
     >>> template = '''
     ... [first-section]
     ...
     ... variable=${mako_variable}
     ... variable2  =\tvalue after tab
     ... ## This section had some whitespace and stuff
     ...
     ...
     ... # ${mako_function()}
     ... [second-section]
     ... %if conditional_options == 'option-a':
     ... # option a was chosen
     ... %elif conditional_options == 'option-b':
     ... some_variable = "never mind - option-b will not be used anyway ..."
     ... %endif
     ...
     ... [comment-section]
     ... #variable3 = 3.0
     ... #variable4 = 4.0
     ... #variable5 = 5.0
     ... variable5 = 5.1
     ... #variable6 = 6.0
     ... #variable6 = 6.1
     ... #variable7 = 7.0
     ... variable7 = 7.1
     ... variable8 = 8.0
     ... '''
     >>> mako_variable_values = {'mako_variable': 'VALUE', 'mako_function': (lambda: 'FUNCTION RESULT'),

kallithea/templates/ini/template.ini.mako

➞

Show inline comments

file renamed from kallithea/lib/paster_commands/template.ini.mako to kallithea/templates/ini/template.ini.mako

scripts/generate-ini.py

➞

Show inline comments

 #!/usr/bin/env python3
 """
-Based on kallithea/lib/paster_commands/template.ini.mako, generate development.ini
+Generate development.ini based on the ini template.
 """
 import re
 from kallithea.lib import inifile
 # files to be generated from the mako template
 ini_files = [
     ('development.ini',
+        {
             '[server:main]': {
                 'host': '0.0.0.0',
             },
             '[app:main]': {
                 'debug': 'true',
                 'app_instance_uuid': 'development-not-secret',
                 'session.secret': 'development-not-secret',
             },
             '[logger_root]': {
                 'handlers': 'console_color',
             },
             '[logger_routes]': {
                 'level': 'DEBUG',
             },
             '[logger_beaker]': {
                 'level': 'DEBUG',
             },
             '[logger_templates]': {
                 'level': 'INFO',
             },
             '[logger_kallithea]': {
                 'level': 'DEBUG',
             },
             '[logger_tg]': {
                 'level': 'DEBUG',
             },
             '[logger_gearbox]': {
                 'level': 'DEBUG',
             },
             '[logger_whoosh_indexer]': {
                 'level': 'DEBUG',
             },
         },
     ),
+]

0 comments (0 inline, 0 general)