# HG changeset patch # User Thomas De Schampheleire # Date 2020-10-06 20:18:40 # Node ID 495dea7c2a137942ced3be08406105256faae258 # Parent 833b93e83349282a970534df26385f7a8bdee884 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. diff --git a/MANIFEST.in b/MANIFEST.in --- a/MANIFEST.in +++ b/MANIFEST.in @@ -18,7 +18,6 @@ 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 * diff --git a/kallithea/lib/inifile.py b/kallithea/lib/inifile.py --- a/kallithea/lib/inifile.py +++ b/kallithea/lib/inifile.py @@ -32,7 +32,7 @@ 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', diff --git a/kallithea/lib/paster_commands/template.ini.mako b/kallithea/templates/ini/template.ini.mako rename from kallithea/lib/paster_commands/template.ini.mako rename to kallithea/templates/ini/template.ini.mako diff --git a/scripts/generate-ini.py b/scripts/generate-ini.py --- a/scripts/generate-ini.py +++ b/scripts/generate-ini.py @@ -1,6 +1,6 @@ #!/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