Drop python2 and pychart dependencies

Python 2 is EOL at the end of 2019, so don't depend on it anymore.
Remove pychart support, because upstream is dead and there is no python3
version. We were only using it for one graph, and that has been
replaced in osmo-bsc I36b721f895caee9766528e14d854b6aa2a2fac85.

Depends: osmo-bsc I36b721f895caee9766528e14d854b6aa2a2fac85
Related: OS#2819
Change-Id: I57522e57e39682d6d123af4584785d327361e5a3

4 files changed, 4 insertions, 26 deletions

diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc
index 7cb660f..54969fc 100644
--- a/build/Makefile.asciidoc.inc
+++ b/build/Makefile.asciidoc.inc
@@ -37,7 +37,7 @@ CLEAN_FILES += $(ASCIIDOC_NAME:%=%__*.png) $(ASCIIDOC_NAME:%=%__*.svg) $(ASCIIDO
 CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html)
 UPLOAD_FILES += $(ASCIIDOC_PDF)
 
-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)'
+ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)'
 DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0
 
 ifeq (,$(BUILD_RELEASE))
diff --git a/build/filter-wrapper.py b/build/filter-wrapper.py
index 82fec1b..83db291 100755
--- a/build/filter-wrapper.py
+++ b/build/filter-wrapper.py
@@ -1,4 +1,4 @@
-#!  /usr/bin/env python
+#!/usr/bin/env python3
 """Simple wrapper for filter programs which ensures that a blank
 is returned as output.  The purpose is to silence the
 AsciiDoc warning "no output from filter".
diff --git a/build/python2-filter.conf b/build/python2-filter.conf
deleted file mode 100644
index 812c7c2..0000000
--- a/build/python2-filter.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# AsciiDoc mscgen filter configuration file.
-# ${OSMO_GSM_MANUALS}/build is symlinked to ./build when building.
-#
-
-[python2-filter-style]
-python2-style=template="python2-block",subs=(),posattrs=("style","target"),filter='./build/filter-wrapper.py python2 - --output="{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}"'
-
-[blockdef-listing]
-template::[python2-filter-style]
-
-[paradef-default]
-template::[python2-filter-style]
-
-[python2-block]
-template::[filter-image-pngsvg-blockmacro]
-
-[filter-image-pngsvg-blockmacro]
-{target%}{counter2:target-number}
-{target%}{set2:target:{docname}__{target-number}.{format={basebackend-docbook!png}{basebackend-docbook?png}}}
-|
-template::[image-blockmacro]
diff --git a/build/unix-time-to-fmt.py b/build/unix-time-to-fmt.py
index 72ece26..9e5e141 100755
--- a/build/unix-time-to-fmt.py
+++ b/build/unix-time-to-fmt.py
@@ -1,11 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Usage:
 
   unix-time-to-fmt.py 1234567 [%Y-%m-%d[...]]
 
 Convert unix timestamp to a string of the given format in UTC, according to
-  https://docs.python.org/2/library/time.html
+  https://docs.python.org/3/library/time.html
 Default is '%Y-%b-%d' --> 2016-Jan-01
 """