<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop python2 and pychart dependencies<br><br>Python 2 is EOL at the end of 2019, so don't depend on it anymore.<br>Remove pychart support, because upstream is dead and there is no python3<br>version. We were only using it for one graph, and that has been<br>replaced in osmo-bsc I36b721f895caee9766528e14d854b6aa2a2fac85.<br><br>Depends: osmo-bsc I36b721f895caee9766528e14d854b6aa2a2fac85<br>Related: OS#2819<br>Change-Id: I57522e57e39682d6d123af4584785d327361e5a3<br>---<br>M INSTALL.txt<br>M build/Makefile.asciidoc.inc<br>M build/filter-wrapper.py<br>D build/python2-filter.conf<br>M build/unix-time-to-fmt.py<br>M check-depends.sh<br>M debian/control<br>7 files changed, 4 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/INSTALL.txt b/INSTALL.txt</span><br><span>index 3f4ef9f..d241fd2 100644</span><br><span>--- a/INSTALL.txt</span><br><span>+++ b/INSTALL.txt</span><br><span>@@ -9,7 +9,6 @@</span><br><span> docbook5-xml \</span><br><span> mscgen \</span><br><span> graphviz \</span><br><span style="color: hsl(0, 100%, 40%);">- python-pychart \</span><br><span> python3-nwdiag</span><br><span> </span><br><span> (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.)</span><br><span>diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc</span><br><span>index 7cb660f..54969fc 100644</span><br><span>--- a/build/Makefile.asciidoc.inc</span><br><span>+++ b/build/Makefile.asciidoc.inc</span><br><span>@@ -37,7 +37,7 @@</span><br><span> CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html)</span><br><span> UPLOAD_FILES += $(ASCIIDOC_PDF)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)'</span><br><span style="color: hsl(120, 100%, 40%);">+ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)'</span><br><span> DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0</span><br><span> </span><br><span> ifeq (,$(BUILD_RELEASE))</span><br><span>diff --git a/build/filter-wrapper.py b/build/filter-wrapper.py</span><br><span>index 82fec1b..83db291 100755</span><br><span>--- a/build/filter-wrapper.py</span><br><span>+++ b/build/filter-wrapper.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#! /usr/bin/env python</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> """Simple wrapper for filter programs which ensures that a blank</span><br><span> is returned as output. The purpose is to silence the</span><br><span> AsciiDoc warning "no output from filter".</span><br><span>diff --git a/build/python2-filter.conf b/build/python2-filter.conf</span><br><span>deleted file mode 100644</span><br><span>index 812c7c2..0000000</span><br><span>--- a/build/python2-filter.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,22 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-# AsciiDoc mscgen filter configuration file.</span><br><span style="color: hsl(0, 100%, 40%);">-# ${OSMO_GSM_MANUALS}/build is symlinked to ./build when building.</span><br><span style="color: hsl(0, 100%, 40%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[python2-filter-style]</span><br><span style="color: hsl(0, 100%, 40%);">-python2-style=template="python2-block",subs=(),posattrs=("style","target"),filter='./build/filter-wrapper.py python2 - --output="{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}"'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[blockdef-listing]</span><br><span style="color: hsl(0, 100%, 40%);">-template::[python2-filter-style]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[paradef-default]</span><br><span style="color: hsl(0, 100%, 40%);">-template::[python2-filter-style]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[python2-block]</span><br><span style="color: hsl(0, 100%, 40%);">-template::[filter-image-pngsvg-blockmacro]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[filter-image-pngsvg-blockmacro]</span><br><span style="color: hsl(0, 100%, 40%);">-{target%}{counter2:target-number}</span><br><span style="color: hsl(0, 100%, 40%);">-{target%}{set2:target:{docname}__{target-number}.{format={basebackend-docbook!png}{basebackend-docbook?png}}}</span><br><span style="color: hsl(0, 100%, 40%);">-|</span><br><span style="color: hsl(0, 100%, 40%);">-template::[image-blockmacro]</span><br><span>diff --git a/build/unix-time-to-fmt.py b/build/unix-time-to-fmt.py</span><br><span>index 72ece26..9e5e141 100755</span><br><span>--- a/build/unix-time-to-fmt.py</span><br><span>+++ b/build/unix-time-to-fmt.py</span><br><span>@@ -1,11 +1,11 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> """</span><br><span> Usage:</span><br><span> </span><br><span> unix-time-to-fmt.py 1234567 [%Y-%m-%d[...]]</span><br><span> </span><br><span> Convert unix timestamp to a string of the given format in UTC, according to</span><br><span style="color: hsl(0, 100%, 40%);">- https://docs.python.org/2/library/time.html</span><br><span style="color: hsl(120, 100%, 40%);">+ https://docs.python.org/3/library/time.html</span><br><span> Default is '%Y-%b-%d' --> 2016-Jan-01</span><br><span> """</span><br><span> </span><br><span>diff --git a/check-depends.sh b/check-depends.sh</span><br><span>index d640abf..c841086 100755</span><br><span>--- a/check-depends.sh</span><br><span>+++ b/check-depends.sh</span><br><span>@@ -8,14 +8,6 @@</span><br><span> fi</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# $1: module name, $2: package name</span><br><span style="color: hsl(0, 100%, 40%);">-check_dep_python2_module() {</span><br><span style="color: hsl(0, 100%, 40%);">- if ! echo "import $1" | python2 - >/dev/null 2>&1; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "Failed to import '$1' module, please install $2."</span><br><span style="color: hsl(0, 100%, 40%);">- exit 1</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> check_dep_bin mscgen mscgen</span><br><span> check_dep_bin xsltproc libxslt</span><br><span> check_dep_bin a2x asciidoc</span><br><span>@@ -23,7 +15,5 @@</span><br><span> check_dep_bin dblatex dblatex</span><br><span> check_dep_bin packetdiag3 python3-nwdiag</span><br><span> check_dep_bin dot graphviz</span><br><span style="color: hsl(0, 100%, 40%);">-check_dep_bin python2 python2</span><br><span style="color: hsl(0, 100%, 40%);">-check_dep_python2_module pychart python2-pychart</span><br><span> </span><br><span> echo "All dependencies installed!"</span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index afd09a3..fa44525 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -14,9 +14,7 @@</span><br><span> graphviz,</span><br><span> libxml2-utils,</span><br><span> mscgen,</span><br><span style="color: hsl(0, 100%, 40%);">- python,</span><br><span> python3-nwdiag,</span><br><span style="color: hsl(0, 100%, 40%);">- python-pychart,</span><br><span> xsltproc</span><br><span> Standards-Version: 3.9.8</span><br><span> Homepage: https://git.osmocom.org/osmo-gsm-manuals/</span><br><span>@@ -31,9 +29,7 @@</span><br><span> graphviz,</span><br><span> libxml2-utils,</span><br><span> mscgen,</span><br><span style="color: hsl(0, 100%, 40%);">- python,</span><br><span> python3-nwdiag,</span><br><span style="color: hsl(0, 100%, 40%);">- python-pychart,</span><br><span> xsltproc</span><br><span> Description: Osmocom manuals shared code</span><br><span> All Osomocom repositories require this package to build their manuals.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504">change 16504</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-manuals </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I57522e57e39682d6d123af4584785d327361e5a3 </div>
<div style="display:none"> Gerrit-Change-Number: 16504 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>