1.7.5

Changelog:
* Overwrite templates on `templates_rewrite: true` instead of rewrite. (vstconsulting/polemarch#103)

See merge request polemarch/ce!195

Author: onegreyonewhite

polemarch/__init__.py

@@ -31,6 +31,6 @@
     "VST_ROOT_URLCONF": os.getenv("VST_ROOT_URLCONF", 'vstutils.urls'),
 }
 
-__version__ = "1.7.4"
+__version__ = "1.7.5"
 
 prepare_environment(**default_settings)

polemarch/main/repo/_base.py

@@ -79,8 +79,10 @@ def __create_template(self, template_name: Text, template_data: Dict) -> Templat
         :param template_data: Template data
         :return: created Template object
         '''
-        self.message('Loading template[{}] into the project.'.format(template_name))
-        return self.proj.template.create(name=template_name, **template_data)
+        self.message(f'Loading template[{template_name}] into the project.')
+        obj, created = self.proj.template.update_or_create(name=template_name, defaults=template_data)
+        self.message(f'Template[{obj.name}] {"created" if created else "updated"} in the project.')
+        return obj
 
     def pm_handle_templates(self, feature: Text, data: Dict) -> NoReturn:
         '''

polemarch/main/tests/executions.py

@@ -1286,7 +1286,7 @@ def test_project_git(self):
         pm_yaml['sync_on_run'] = True
         # templates
         pm_yaml['templates'] = test_yaml_templates
-        pm_yaml['templates_rewrite'] = False
+        pm_yaml['templates_rewrite'] = True
         # fast task widget
         pm_yaml['view'] = test_yaml_view
         # Prepare repo

polemarch/main/tests/test_repo.tar.gz

@@ -1,5 +1,5 @@
 vcrpy-unittest==0.1.6
-coverage<=4.5.4
-mock<=3.0.5
+coverage~=5.1
+mock~=3.0.5
 fakeldap==0.6.1
-tblib==1.3.2
+tblib~=1.6.0

requirements-test.txt

@@ -2,7 +2,7 @@
 envlist = py3{6,7,8}-{coverage,install},flake,pylint,jshint
 skipsdist = True
 setenv = PIP_CONFIG_FILE=.pip.conf
-whitelist_externals = 
+whitelist_externals =
     rm
     bash
 
@@ -12,7 +12,7 @@ passenv =
     DJANGO_LOG_LEVEL
     CC
     BUILD_COMPILE
-whitelist_externals = 
+whitelist_externals =
     rm
     ls
     ln
@@ -44,7 +44,7 @@ deps =
     flake8
     -rrequirements.txt
     -rrequirements-git.txt
-commands = 
+commands =
   flake8 --config=.pep8 polemarch
 
 [testenv:jshint]
@@ -97,7 +97,7 @@ whitelist_externals =
     rm
 commands =
     rm -rf dist build
-    tox -c tox_build.ini --workdir {toxworkdir}
+    tox -c tox_build.ini -e py36-build,py37-wheel --workdir {toxworkdir}
 
 [testenv:builddoc]
 basepython = python3.6
@@ -160,7 +160,7 @@ passenv = *
 whitelist_externals =
     /bin/sh
 commands =
-    ansible-playbook -i localhost, --connection local k8s_env_destroy.yaml -vvvv 
+    ansible-playbook -i localhost, --connection local k8s_env_destroy.yaml -vvvv
 deps =
     ansible~=2.9.0
     openshift>=0.6