From patchwork Mon Oct 28 16:51:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2553 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 47212c2vrKz43T1 for ; Mon, 28 Oct 2019 16:51:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 47212b2VFdz3Qv; Mon, 28 Oct 2019 16:51:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47212b13Rvz2ybT; Mon, 28 Oct 2019 16:51:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 47212Z1d8bz2yYZ for ; Mon, 28 Oct 2019 16:51:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 47212Y6kzQz3Qv; Mon, 28 Oct 2019 16:51:33 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1572281493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fPnPH5f/KB6kiyNT/dLbG2i0gLxa7W7vjwJIVfFCI0I=; b=Qpbkhs0hnkVyyV4nTzCP+hwWTGMPJ78REJ/cCeRcD2nu4ErUbdC4pKFrFqW6I1oHaOGXlp zRvyEuVkR4K6q2BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1572281493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fPnPH5f/KB6kiyNT/dLbG2i0gLxa7W7vjwJIVfFCI0I=; b=It4oKs4LwZMZAm7MpgqXkUjjYiY4g73ZuIPs6gkS6ENMK2ERp0zrAvN0d2LnyuuM3vC3pA qoJa3ra2rxftGsKeT2gGaGocYRD8MUZ4KJFl1E5fHHt+uOJ1h9P1ieLHP5OgQ/ZKFecJlD jhI+kczhEu3OM9S25ZwNzrHMqrMVmnXmzzXsr0rQcttD46yTMF/3mF3VX2d00iPCbkvvYC iduri7OKsvQoUGAHKowYp/JmSKp2jt+lpapPGWkztwlO3NOUPf4j58cA/Qr3CJlRL8mC42 vq4kIDa6i+BI7u3V0uZTsHg7HjrXsSH+uOAB+1R7+xwabaFDuSJS3RwWzBBptg== 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 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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/packages/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/dependency_links.txt -#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/entry_points.txt -#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/top_level.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.txt +usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/dependency_links.txt +usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/entry_points.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 = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = speedtest-cli -PAK_VER = 1 +PAK_VER = 2 -DEPS = "" +DEPS = "python3" ############################################################################### # 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=/ + cd $(DIR_APP) && python3 setup.py build + cd $(DIR_APP) && python3 setup.py install --root=/ @rm -rf $(DIR_APP) @$(POSTBUILD)