<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/16543">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian, utils: switch to python 3<br><br>Make build and external tests work with python3, so we can drop<br>the python2 dependency.<br><br>This should be merged shortly after osmo-python-tests was migrated to<br>python3, and the jenkins build slaves were (automatically) updated to<br>have the new osmo-python-tests installed.<br><br>Related: OS#2819<br>Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7<br>Change-Id: I84ef43f700e125c7a65f92347f12844e07e65655<br>---<br>M debian/control<br>M include/Makefile.am<br>M src/gsm/Makefile.am<br>M tests/Makefile.am<br>M utils/conv_codes_gsm.py<br>M utils/conv_gen.py<br>6 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian/control b/debian/control</span><br><span>index 6c9cfae..cf7a853 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -16,7 +16,7 @@</span><br><span> pkg-config,</span><br><span> libtalloc-dev,</span><br><span> libsctp-dev,</span><br><span style="color: hsl(0, 100%, 40%);">- python (>= 2.7.6)</span><br><span style="color: hsl(120, 100%, 40%);">+ python3</span><br><span> Standards-Version: 3.9.8</span><br><span> Vcs-Git: git://git.osmocom.org/libosmocore.git</span><br><span> Vcs-Browser: http://git.osmocom.org/libosmocore/</span><br><span>diff --git a/include/Makefile.am b/include/Makefile.am</span><br><span>index a82d6ac..d76addd 100644</span><br><span>--- a/include/Makefile.am</span><br><span>+++ b/include/Makefile.am</span><br><span>@@ -179,7 +179,7 @@</span><br><span> $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@</span><br><span> </span><br><span> osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py</span><br><span style="color: hsl(0, 100%, 40%);">- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_header gsm \</span><br><span> --target-path $(builddir)/osmocom/gsm</span><br><span> </span><br><span> CLEANFILES = osmocom/gsm/gsm0503.h</span><br><span>diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am</span><br><span>index f13ba9d..4a1faca 100644</span><br><span>--- a/src/gsm/Makefile.am</span><br><span>+++ b/src/gsm/Makefile.am</span><br><span>@@ -49,6 +49,6 @@</span><br><span> </span><br><span> # Convolutional codes generation</span><br><span> gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py</span><br><span style="color: hsl(0, 100%, 40%);">- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm</span><br><span style="color: hsl(120, 100%, 40%);">+ $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_codes gsm</span><br><span> </span><br><span> CLEANFILES = gsm0503_conv.c</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index e8e4dee..3a3ea37 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -362,7 +362,7 @@</span><br><span> mv $@.tmp $@</span><br><span> </span><br><span> conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py</span><br><span style="color: hsl(0, 100%, 40%);">- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \</span><br><span> --target-path $(builddir)/conv</span><br><span> </span><br><span> if ENABLE_EXT_TESTS</span><br><span>diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py</span><br><span>index ec77660..e189985 100644</span><br><span>--- a/utils/conv_codes_gsm.py</span><br><span>+++ b/utils/conv_codes_gsm.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> # -*- coding: utf-8 -*-</span><br><span> </span><br><span> from conv_gen import ConvolutionalCode</span><br><span>diff --git a/utils/conv_gen.py b/utils/conv_gen.py</span><br><span>index 06283d8..d2eda15 100644</span><br><span>--- a/utils/conv_gen.py</span><br><span>+++ b/utils/conv_gen.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> </span><br><span> mod_license = """</span><br><span> /*</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/16543">change 16543</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/libosmocore/+/16543"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I84ef43f700e125c7a65f92347f12844e07e65655 </div>
<div style="display:none"> Gerrit-Change-Number: 16543 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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-MessageType: merged </div>