Hello community,
here is the log from the commit of package python-jenkins-job-builder for
openSUSE:Factory checked in at 2019-08-13 13:27:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jenkins-job-builder (Old)
and /work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new.9556 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jenkins-job-builder"
Tue Aug 13 13:27:27 2019 rev:18 rq:722910 version:3.0.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jenkins-job-builder/python-jenkins-job-builder.changes
2019-08-05 10:38:47.283317117 +0200
+++
/work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new.9556/python-jenkins-job-builder.changes
2019-08-13 13:27:31.581319514 +0200
@@ -1,0 +2,6 @@
+Mon Aug 12 16:30:50 UTC 2019 - Dirk Mueller <[email protected]>
+
+- update to 3.0.1:
+ * Revert "Add support for rendering jinja template as yaml"
+
+-------------------------------------------------------------------
Old:
----
jenkins-job-builder-3.0.0.tar.gz
New:
----
jenkins-job-builder-3.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jenkins-job-builder.spec ++++++
--- /var/tmp/diff_new_pack.h1siR4/_old 2019-08-13 13:27:32.717319215 +0200
+++ /var/tmp/diff_new_pack.h1siR4/_new 2019-08-13 13:27:32.721319214 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-jenkins-job-builder
-Version: 3.0.0
+Version: 3.0.1
Release: 0
Summary: Program for configuring Jenkins jobs with YAML
License: Apache-2.0
++++++ jenkins-job-builder-3.0.0.tar.gz -> jenkins-job-builder-3.0.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.0/ChangeLog
new/jenkins-job-builder-3.0.1/ChangeLog
--- old/jenkins-job-builder-3.0.0/ChangeLog 2019-07-25 18:34:37.000000000
+0200
+++ new/jenkins-job-builder-3.0.1/ChangeLog 2019-07-29 21:49:12.000000000
+0200
@@ -1,6 +1,11 @@
CHANGES
=======
+3.0.1
+-----
+
+* Revert "Add support for rendering jinja template as yaml"
+
3.0.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.0/PKG-INFO
new/jenkins-job-builder-3.0.1/PKG-INFO
--- old/jenkins-job-builder-3.0.0/PKG-INFO 2019-07-25 18:34:38.000000000
+0200
+++ new/jenkins-job-builder-3.0.1/PKG-INFO 2019-07-29 21:49:13.000000000
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: jenkins-job-builder
-Version: 3.0.0
+Version: 3.0.1
Summary: Manage Jenkins jobs with YAML
Home-page: https://docs.openstack.org/infra/jenkins-job-builder/
Author: OpenStack Infrastructure Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.0/jenkins_job_builder.egg-info/PKG-INFO
new/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/PKG-INFO
--- old/jenkins-job-builder-3.0.0/jenkins_job_builder.egg-info/PKG-INFO
2019-07-25 18:34:37.000000000 +0200
+++ new/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/PKG-INFO
2019-07-29 21:49:12.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: jenkins-job-builder
-Version: 3.0.0
+Version: 3.0.1
Summary: Manage Jenkins jobs with YAML
Home-page: https://docs.openstack.org/infra/jenkins-job-builder/
Author: OpenStack Infrastructure Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.0/jenkins_job_builder.egg-info/SOURCES.txt
new/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/SOURCES.txt
--- old/jenkins-job-builder-3.0.0/jenkins_job_builder.egg-info/SOURCES.txt
2019-07-25 18:34:38.000000000 +0200
+++ new/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/SOURCES.txt
2019-07-29 21:49:13.000000000 +0200
@@ -2010,9 +2010,6 @@
tests/yamlparser/fixtures/include_path002.conf
tests/yamlparser/fixtures/include_path002.xml
tests/yamlparser/fixtures/include_path002.yaml
-tests/yamlparser/fixtures/jinja-as-yaml-include01.xml
-tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml
-tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml.inc
tests/yamlparser/fixtures/jinja-include01.xml
tests/yamlparser/fixtures/jinja-include01.yaml
tests/yamlparser/fixtures/jinja-include01.yaml.inc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.0/jenkins_job_builder.egg-info/pbr.json
new/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/pbr.json
--- old/jenkins-job-builder-3.0.0/jenkins_job_builder.egg-info/pbr.json
2019-07-25 18:34:37.000000000 +0200
+++ new/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/pbr.json
2019-07-29 21:49:12.000000000 +0200
@@ -1 +1 @@
-{"git_version": "1d48093f", "is_release": true}
\ No newline at end of file
+{"git_version": "63c02a80", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.0/jenkins_jobs/formatter.py
new/jenkins-job-builder-3.0.1/jenkins_jobs/formatter.py
--- old/jenkins-job-builder-3.0.0/jenkins_jobs/formatter.py 2019-07-25
18:33:39.000000000 +0200
+++ new/jenkins-job-builder-3.0.1/jenkins_jobs/formatter.py 2019-07-29
21:48:05.000000000 +0200
@@ -26,7 +26,7 @@
logger = logging.getLogger(__name__)
-def deep_format(obj, paramdict, allow_empty=False, template=True):
+def deep_format(obj, paramdict, allow_empty=False):
"""Apply the paramdict via str.format() to all string objects found within
the supplied obj. Lists and dicts are traversed recursively."""
# YAML serialisation was originally used to achieve this, but that places
@@ -50,26 +50,13 @@
elif isinstance(obj, list):
ret = type(obj)()
for item in obj:
- ret.append(deep_format(item, paramdict,
- allow_empty=allow_empty,
- template=template))
+ ret.append(deep_format(item, paramdict, allow_empty))
elif isinstance(obj, dict):
ret = type(obj)()
for item in obj:
try:
- # deep_formatting dsl when not a job-template is not necessary
- # as it will most likely result in keyerror due to trying
- # to substitute values inside the dsl that do not exist.
- if item not in ['dsl'] or template:
- ret[CustomFormatter(allow_empty).format(item,
- **paramdict)] = \
- deep_format(obj[item], paramdict,
- allow_empty=allow_empty,
- template=template)
- else:
- ret[CustomFormatter(allow_empty).format(item,
- **paramdict)] = \
- obj[item]
+ ret[CustomFormatter(allow_empty).format(item, **paramdict)] = \
+ deep_format(obj[item], paramdict, allow_empty)
except KeyError as exc:
missing_key = exc.args[0]
desc = "%s parameter missing to format %s\nGiven:\n%s" % (
@@ -85,8 +72,7 @@
if isinstance(ret, CustomLoader):
# If we have a CustomLoader here, we've lazily-loaded a template;
# attempt to format it.
- ret = deep_format(ret, paramdict, allow_empty=allow_empty,
- template=template)
+ ret = deep_format(ret, paramdict, allow_empty=allow_empty)
return ret
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.0/jenkins_jobs/local_yaml.py
new/jenkins-job-builder-3.0.1/jenkins_jobs/local_yaml.py
--- old/jenkins-job-builder-3.0.0/jenkins_jobs/local_yaml.py 2019-07-25
18:33:39.000000000 +0200
+++ new/jenkins-job-builder-3.0.1/jenkins_jobs/local_yaml.py 2019-07-29
21:48:05.000000000 +0200
@@ -491,17 +491,6 @@
return Jinja2Loader(contents, loader.search_path)
-class YamlIncludeJinja2AsYaml(YamlIncludeJinja2):
- yaml_tag = u'!include-jinja2-as-yaml:'
-
- @classmethod
- def _from_file(cls, loader, node):
- contents = cls._open_file(loader, node)
- if isinstance(contents, LazyLoader):
- return contents
- return Jinja2LoaderAsYaml(contents, loader.search_path)
-
-
class DeprecatedTag(BaseYAMLObject):
@classmethod
@@ -548,14 +537,6 @@
return self._template.render(kwargs)
-class Jinja2LoaderAsYaml(Jinja2Loader):
- """A loader for Jinja2-templated files that renders yaml."""
-
- def format(self, **kwargs):
- raw_yaml = super(Jinja2LoaderAsYaml, self).format(**kwargs)
- return yaml.load(raw_yaml)
-
-
class CustomLoaderCollection(object):
"""Helper class to format a collection of CustomLoader objects"""
def __init__(self, sequence):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.0/jenkins_jobs/parser.py
new/jenkins-job-builder-3.0.1/jenkins_jobs/parser.py
--- old/jenkins-job-builder-3.0.0/jenkins_jobs/parser.py 2019-07-25
18:33:39.000000000 +0200
+++ new/jenkins-job-builder-3.0.1/jenkins_jobs/parser.py 2019-07-29
21:48:05.000000000 +0200
@@ -243,16 +243,6 @@
if jobs_glob and not matches(job['name'], jobs_glob):
logger.debug("Ignoring job {0}".format(job['name']))
continue
-
- # Attempt to format all parts of the job definition as they might
- # be using custom loaders.
- try:
- job = deep_format(job, job, template=False)
- except Exception:
- logging.error(
- "Failure formatting job '%s' with itself", job)
- raise
-
logger.debug("Expanding job '{0}'".format(job['name']))
self._formatDescription(job)
self.jobs.append(job)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.0/tests/yamlparser/fixtures/jinja-as-yaml-include01.xml
new/jenkins-job-builder-3.0.1/tests/yamlparser/fixtures/jinja-as-yaml-include01.xml
---
old/jenkins-job-builder-3.0.0/tests/yamlparser/fixtures/jinja-as-yaml-include01.xml
2019-07-25 18:33:39.000000000 +0200
+++
new/jenkins-job-builder-3.0.1/tests/yamlparser/fixtures/jinja-as-yaml-include01.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project>
- <actions/>
- <description><!-- Managed by Jenkins Job Builder --></description>
- <keepDependencies>false</keepDependencies>
- <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <concurrentBuild>false</concurrentBuild>
- <canRoam>true</canRoam>
- <properties>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.ChoiceParameterDefinition>
- <name>TEST_CHOICE</name>
- <description/>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>a</string>
- <string>b</string>
- <string>c</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- </properties>
- <scm class="hudson.scm.NullSCM"/>
- <builders/>
- <publishers/>
- <buildWrappers/>
-</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.0/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml
new/jenkins-job-builder-3.0.1/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml
---
old/jenkins-job-builder-3.0.0/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml
2019-07-25 18:33:39.000000000 +0200
+++
new/jenkins-job-builder-3.0.1/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml
1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-- job:
- name: test-job-as-yaml
- parameters:
- - choice:
- name: TEST_CHOICE
- choices:
- !include-jinja2-as-yaml: jinja-as-yaml-include01.yaml.inc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.0/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml.inc
new/jenkins-job-builder-3.0.1/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml.inc
---
old/jenkins-job-builder-3.0.0/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml.inc
2019-07-25 18:33:39.000000000 +0200
+++
new/jenkins-job-builder-3.0.1/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml.inc
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-{% for item in ['a', 'b', 'c'] %}
-- {{ item }}
-{% endfor -%}
