From: Michael Tremer <michael.tremer@ipfire.org>
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 [thread overview]
Message-ID: <20191028165129.20632-1-michael.tremer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2717 bytes --]
This seems to be required although the documentation says
that Python 2 is supported.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
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)
--
2.20.1
reply other threads:[~2019-10-28 16:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028165129.20632-1-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox