From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] speedtest-cli: Use Python 3 instead of Python 2 Date: Mon, 28 Oct 2019 16:51:29 +0000 Message-ID: <20191028165129.20632-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5874569544489025514==" List-Id: --===============5874569544489025514== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This seems to be required although the documentation says that Python 2 is supported. Signed-off-by: Michael Tremer --- config/rootfiles/packages/speedtest-cli | 16 ++++++++-------- lfs/speedtest-cli | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/packages/speedtest-cli b/config/rootfiles/packa= ges/speedtest-cli index f21c7afa7..7dc60ca81 100644 --- a/config/rootfiles/packages/speedtest-cli +++ b/config/rootfiles/packages/speedtest-cli @@ -1,10 +1,10 @@ usr/bin/speedtest usr/bin/speedtest-cli -usr/lib/python2.7/site-packages/speedtest.py -usr/lib/python2.7/site-packages/speedtest.pyc -#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info -#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/PKG-INFO -#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/SOURCES.= txt -#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/dependen= cy_links.txt -#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/entry_po= ints.txt -#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/top_leve= l.txt +usr/lib/python3.6/site-packages/__pycache__/speedtest.cpython-36.pyc +usr/lib/python3.6/site-packages/speedtest.py +usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info +usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/PKG-INFO +usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/SOURCES.t= xt +usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/dependenc= y_links.txt +usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/entry_poi= nts.txt +usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/top_level= .txt diff --git a/lfs/speedtest-cli b/lfs/speedtest-cli index aa2af73bb..6c11d5314 100644 --- a/lfs/speedtest-cli +++ b/lfs/speedtest-cli @@ -32,9 +32,9 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D speedtest-cli -PAK_VER =3D 1 +PAK_VER =3D 2 =20 -DEPS =3D "" +DEPS =3D "python3" =20 ############################################################################= ### # Top-level Rules @@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py build - cd $(DIR_APP) && python setup.py install --root=3D/ + cd $(DIR_APP) && python3 setup.py build + cd $(DIR_APP) && python3 setup.py install --root=3D/ @rm -rf $(DIR_APP) @$(POSTBUILD) --=20 2.20.1 --===============5874569544489025514==--