From a47d37c94684ba688a6eec06d0346ee13b03aad4 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 11 Dec 2019 08:46:41 +0100 Subject: debian, utils: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I84ef43f700e125c7a65f92347f12844e07e65655 --- debian/control | 2 +- include/Makefile.am | 2 +- src/gsm/Makefile.am | 2 +- tests/Makefile.am | 2 +- utils/conv_codes_gsm.py | 2 +- utils/conv_gen.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 6c9cfae9..cf7a8538 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), pkg-config, libtalloc-dev, libsctp-dev, - python (>= 2.7.6) + python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/libosmocore.git Vcs-Browser: http://git.osmocom.org/libosmocore/ diff --git a/include/Makefile.am b/include/Makefile.am index a82d6ac4..d76addd0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -179,7 +179,7 @@ osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \ + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_header gsm \ --target-path $(builddir)/osmocom/gsm CLEANFILES = osmocom/gsm/gsm0503.h diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index f13ba9d3..4a1facae 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -49,6 +49,6 @@ EXTRA_DIST = libosmogsm.map # Convolutional codes generation gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_codes gsm CLEANFILES = gsm0503_conv.c diff --git a/tests/Makefile.am b/tests/Makefile.am index e8e4dee1..3a3ea376 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -362,7 +362,7 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 mv $@.tmp $@ conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ --target-path $(builddir)/conv if ENABLE_EXT_TESTS diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py index ec776605..e189985a 100644 --- a/utils/conv_codes_gsm.py +++ b/utils/conv_codes_gsm.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from conv_gen import ConvolutionalCode diff --git a/utils/conv_gen.py b/utils/conv_gen.py index 06283d87..d2eda152 100644 --- a/utils/conv_gen.py +++ b/utils/conv_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 mod_license = """ /* -- cgit v1.2.3