<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px;
}
body {
font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<h3 style="margin-top: 20px; margin-bottom: 10px;">
Chris Lamb pushed to branch master at <a href="https://salsa.debian.org/reproducible-builds/diffoscope">Reproducible Builds / diffoscope</a>
</h3>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<ul>
<li>
<strong style="font-weight: 600;"><a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/38f76379bb88fa64bf547f2aaf8f032a8771a4ba">38f76379</a></strong>
<div>
<span> by Chris Lamb </span> <i> at 2024-07-23T13:57:54+01:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Correct import of identify_version after refactoring change in 037bdcbb0.
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
1 changed file:
</h4>
<ul>
<li class="file-stats">
<a href="#df6e68a4c8c82a13211abef3f3a25bef75ac1e84">
tests/comparators/test_ico_image.py
</a>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Changes:
</h4>
<li id="df6e68a4c8c82a13211abef3f3a25bef75ac1e84">
<a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/38f76379bb88fa64bf547f2aaf8f032a8771a4ba#df6e68a4c8c82a13211abef3f3a25bef75ac1e84"><strong style="font-weight: 600;">tests/comparators/test_ico_image.py</strong></a>
<hr style="overflow: hidden; border: 1px solid #e1e1e1;">
<table class="code white" style="border-spacing: 0; border-collapse: collapse; width: auto; font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="26" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="26" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="line_content match" style="color: rgba(31,30,36,.24); padding: inherit;" bgcolor="#fbfafd">@@ -26,7 +26,7 @@ from ..utils.tools import (</td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="26" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
26
</td>
<td class="new_line diff-line-num" data-linenumber="26" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
26
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC26" class="line" lang="python"> <span class="n" style="color: #333;">skip_unless_tools_exist</span><span class="p">,</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="27" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
27
</td>
<td class="new_line diff-line-num" data-linenumber="27" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
27
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC27" class="line" lang="python"> <span class="n" style="color: #333;">skip_unless_tool_is_between</span><span class="p">,</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="28" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
28
</td>
<td class="new_line diff-line-num" data-linenumber="28" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
28
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC28" class="line" lang="python"><span class="p">)</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="29" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
29
</td>
<td class="new_line diff-line-num old" data-linenumber="29" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>-<span id="LC29" class="line" lang="python"><span class="kn" style="font-weight: 600;">from</span> <span class="n" style="color: #333;">.test_jpeg_image</span> <span class="kn" style="font-weight: 600;">import</span> <span class="n" style="color: #333;">i<span class="idiff left right deletion" style="background-color: #fac5cd;">dentify</span>_version</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="30" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="29" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
29
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>+<span id="LC29" class="line" lang="python"><span class="kn" style="font-weight: 600;">from</span> <span class="n" style="color: #333;">.test_jpeg_image</span> <span class="kn" style="font-weight: 600;">import</span> <span class="n" style="color: #333;">i<span class="idiff left right addition" style="background-color: #c7f0d2;">magemagick</span>_version</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="30" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
30
</td>
<td class="new_line diff-line-num" data-linenumber="30" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
30
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC30" class="line" lang="python"></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="31" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
31
</td>
<td class="new_line diff-line-num" data-linenumber="31" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
31
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC31" class="line" lang="python"></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="32" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
32
</td>
<td class="new_line diff-line-num" data-linenumber="32" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
32
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC32" class="line" lang="python"><span class="n" style="color: #333;">image1</span> <span class="o" style="font-weight: 600;">=</span> <span class="nf" style="color: #900; font-weight: 600;">load_fixture</span><span class="p">(</span><span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">test1.ico</span><span class="sh" style="color: #d14;">"</span><span class="p">)</span></span>
</pre></td>
</tr>
<tr class="line_holder match" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="61" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="61" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="line_content match" style="color: rgba(31,30,36,.24); padding: inherit;" bgcolor="#fbfafd">@@ -61,7 +61,7 @@ def differences_meta(image1_meta, image2_meta):</td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="61" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
61
</td>
<td class="new_line diff-line-num" data-linenumber="61" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
61
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC61" class="line" lang="python"></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="62" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
62
</td>
<td class="new_line diff-line-num" data-linenumber="62" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
62
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC62" class="line" lang="python"><span class="nd">@skip_unless_tools_exist</span><span class="p">(</span><span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">img2txt</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">identify</span><span class="sh" style="color: #d14;">"</span><span class="p">)</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="63" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
63
</td>
<td class="new_line diff-line-num" data-linenumber="63" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
63
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC63" class="line" lang="python"><span class="nd">@skip_unless_tool_is_between</span><span class="p">(</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="64" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
64
</td>
<td class="new_line diff-line-num old" data-linenumber="64" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>-<span id="LC64" class="line" lang="python"> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">identify</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="n" style="color: #333;"><span class="idiff left right deletion" style="background-color: #fac5cd;">identify_version</span></span><span class="p">,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">6.9.10-23</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">7.0.0</span><span class="sh" style="color: #d14;">"</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="65" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="64" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
64
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>+<span id="LC64" class="line" lang="python"> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">identify</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="k" style="font-weight: 600;"><span class="idiff left addition" style="background-color: #c7f0d2;">lambda</span></span><span class="p"><span class="idiff addition" style="background-color: #c7f0d2;">:</span></span><span class="idiff addition" style="background-color: #c7f0d2;"> </span><span class="nf" style="color: #900; font-weight: 600;"><span class="idiff addition" style="background-color: #c7f0d2;">imagemagick_version</span></span><span class="p"><span class="idiff addition" style="background-color: #c7f0d2;">(</span></span><span class="sh" style="color: #d14;"><span class="idiff addition" style="background-color: #c7f0d2;">"</span></span><span class="s" style="color: #d14;"><span class="idiff addition" style="background-color: #c7f0d2;">identify</span></span><span class="sh" style="color: #d14;"><span class="idiff addition" style="background-color: #c7f0d2;">"</span></span><span class="p"><span class="idiff right addition" style="background-color: #c7f0d2;">)</span>,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">6.9.10-23</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">7.0.0</span><span class="sh" style="color: #d14;">"</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="65" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
65
</td>
<td class="new_line diff-line-num" data-linenumber="65" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
65
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC65" class="line" lang="python"><span class="p">)</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="66" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
66
</td>
<td class="new_line diff-line-num" data-linenumber="66" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
66
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC66" class="line" lang="python"><span class="k" style="font-weight: 600;">def</span> <span class="nf" style="color: #900; font-weight: 600;">test_diff_meta</span><span class="p">(</span><span class="n" style="color: #333;">differences_meta</span><span class="p">):</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="67" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
67
</td>
<td class="new_line diff-line-num" data-linenumber="67" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
67
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC67" class="line" lang="python"> <span class="nf" style="color: #900; font-weight: 600;">assert_diff</span><span class="p">(</span><span class="n" style="color: #333;">differences_meta</span><span class="p">[</span><span class="o" style="font-weight: 600;">-</span><span class="mi" style="color: #099;">1</span><span class="p">],</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">ico_image_meta_expected_diff</span><span class="sh" style="color: #d14;">"</span><span class="p">)</span></span>
</pre></td>
</tr>
<tr class="line_holder match" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="69" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="69" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="line_content match" style="color: rgba(31,30,36,.24); padding: inherit;" bgcolor="#fbfafd">@@ -69,7 +69,7 @@ def test_diff_meta(differences_meta):</td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="69" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
69
</td>
<td class="new_line diff-line-num" data-linenumber="69" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
69
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC69" class="line" lang="python"></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="70" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
70
</td>
<td class="new_line diff-line-num" data-linenumber="70" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
70
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC70" class="line" lang="python"><span class="nd">@skip_unless_tools_exist</span><span class="p">(</span><span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">img2txt</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">identify</span><span class="sh" style="color: #d14;">"</span><span class="p">)</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="71" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
71
</td>
<td class="new_line diff-line-num" data-linenumber="71" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
71
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC71" class="line" lang="python"><span class="nd">@skip_unless_tool_is_between</span><span class="p">(</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="72" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
72
</td>
<td class="new_line diff-line-num old" data-linenumber="72" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>-<span id="LC72" class="line" lang="python"> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">identify</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="n" style="color: #333;"><span class="idiff left right deletion" style="background-color: #fac5cd;">identify_version</span></span><span class="p">,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">6.9.10-23</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">7.0.0</span><span class="sh" style="color: #d14;">"</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="73" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="72" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
72
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>+<span id="LC72" class="line" lang="python"> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">identify</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="k" style="font-weight: 600;"><span class="idiff left addition" style="background-color: #c7f0d2;">lambda</span></span><span class="p"><span class="idiff addition" style="background-color: #c7f0d2;">:</span></span><span class="idiff addition" style="background-color: #c7f0d2;"> </span><span class="nf" style="color: #900; font-weight: 600;"><span class="idiff addition" style="background-color: #c7f0d2;">imagemagick_version</span></span><span class="p"><span class="idiff addition" style="background-color: #c7f0d2;">(</span></span><span class="sh" style="color: #d14;"><span class="idiff addition" style="background-color: #c7f0d2;">"</span></span><span class="s" style="color: #d14;"><span class="idiff addition" style="background-color: #c7f0d2;">identify</span></span><span class="sh" style="color: #d14;"><span class="idiff addition" style="background-color: #c7f0d2;">"</span></span><span class="p"><span class="idiff right addition" style="background-color: #c7f0d2;">)</span>,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">6.9.10-23</span><span class="sh" style="color: #d14;">"</span><span class="p">,</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">7.0.0</span><span class="sh" style="color: #d14;">"</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="73" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
73
</td>
<td class="new_line diff-line-num" data-linenumber="73" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
73
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC73" class="line" lang="python"><span class="p">)</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="74" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
74
</td>
<td class="new_line diff-line-num" data-linenumber="74" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
74
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC74" class="line" lang="python"><span class="k" style="font-weight: 600;">def</span> <span class="nf" style="color: #900; font-weight: 600;">test_diff_meta2</span><span class="p">(</span><span class="n" style="color: #333;">differences_meta</span><span class="p">):</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="75" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
75
</td>
<td class="new_line diff-line-num" data-linenumber="75" style="width: 35px; color: rgba(31,30,36,.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
75
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC75" class="line" lang="python"> <span class="nf" style="color: #900; font-weight: 600;">assert_diff</span><span class="p">(</span><span class="n" style="color: #333;">differences_meta</span><span class="p">[</span><span class="o" style="font-weight: 600;">-</span><span class="mi" style="color: #099;">1</span><span class="p">],</span> <span class="sh" style="color: #d14;">"</span><span class="s" style="color: #d14;">ico_image_meta_expected_diff_v2</span><span class="sh" style="color: #d14;">"</span><span class="p">)</span></span>
</pre></td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/38f76379bb88fa64bf547f2aaf8f032a8771a4ba">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://salsa.debian.org">salsa.debian.org</a>. <a href="https://salsa.debian.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://salsa.debian.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/38f76379bb88fa64bf547f2aaf8f032a8771a4ba"}}</script>
</p>
</div>
</body>
</html>