diff --git a/pr_2.patch b/pr_2.patch new file mode 100644 index 0000000..e5a4d3b --- /dev/null +++ b/pr_2.patch @@ -0,0 +1,73 @@ +--- tabulate-0.8.3/test/test_cli.py.orig 2019-09-14 17:58:44.191319677 +0700 ++++ tabulate-0.8.3/test/test_cli.py 2019-09-14 17:59:06.895533501 +0700 +@@ -6,6 +6,7 @@ + from __future__ import print_function + from __future__ import unicode_literals + import os ++import sys + + + import subprocess +@@ -97,7 +98,7 @@ + + def test_script_from_stdin_to_stdout(): + """Command line utility: read from stdin, print to stdout""" +- cmd = ["python", "tabulate.py"] ++ cmd = [sys.executable, "tabulate.py"] + out = run_and_capture_stdout(cmd, input=sample_input()) + expected = SAMPLE_SIMPLE_FORMAT + print("got: ",repr(out)) +@@ -110,7 +111,7 @@ + with TemporaryTextFile() as tmpfile: + tmpfile.write(sample_input()) + tmpfile.seek(0) +- cmd = ["python", "tabulate.py", tmpfile.name] ++ cmd = [sys.executable, "tabulate.py", tmpfile.name] + out = run_and_capture_stdout(cmd) + expected = SAMPLE_SIMPLE_FORMAT + print("got: ",repr(out)) +@@ -124,7 +125,7 @@ + with TemporaryTextFile() as output_file: + input_file.write(sample_input()) + input_file.seek(0) +- cmd = ["python", "tabulate.py", "-o", output_file.name, input_file.name] ++ cmd = [sys.executable, "tabulate.py", "-o", output_file.name, input_file.name] + out = run_and_capture_stdout(cmd) + # check that nothing is printed to stdout + expected = "" +@@ -143,7 +144,7 @@ + def test_script_header_option(): + """Command line utility: -1, --header option""" + for option in ["-1", "--header"]: +- cmd = ["python", "tabulate.py", option] ++ cmd = [sys.executable, "tabulate.py", option] + raw_table = sample_input(with_headers=True) + out = run_and_capture_stdout(cmd, input=raw_table) + expected = SAMPLE_SIMPLE_FORMAT_WITH_HEADERS +@@ -156,7 +157,7 @@ + def test_script_sep_option(): + """Command line utility: -s, --sep option""" + for option in ["-s", "--sep"]: +- cmd = ["python", "tabulate.py", option, ","] ++ cmd = [sys.executable, "tabulate.py", option, ","] + raw_table = sample_input(sep=",") + out = run_and_capture_stdout(cmd, input=raw_table) + expected = SAMPLE_SIMPLE_FORMAT +@@ -168,7 +169,7 @@ + def test_script_floatfmt_option(): + """Command line utility: -F, --float option""" + for option in ["-F", "--float"]: +- cmd = ["python", "tabulate.py", option, ".1e", "--format", "grid"] ++ cmd = [sys.executable, "tabulate.py", option, ".1e", "--format", "grid"] + raw_table = sample_input() + out = run_and_capture_stdout(cmd, input=raw_table) + expected = SAMPLE_GRID_FORMAT_WITH_DOT1E_FLOATS +@@ -180,7 +181,7 @@ + def test_script_format_option(): + """Command line utility: -f, --format option""" + for option in ["-f", "--format"]: +- cmd = ["python", "tabulate.py", "-1", option, "grid"] ++ cmd = [sys.executable, "tabulate.py", "-1", option, "grid"] + raw_table = sample_input(with_headers=True) + out = run_and_capture_stdout(cmd, input=raw_table) + expected = SAMPLE_GRID_FORMAT_WITH_HEADERS diff --git a/python-tabulate.changes b/python-tabulate.changes index bac46ce..c01d369 100644 --- a/python-tabulate.changes +++ b/python-tabulate.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 14 10:10:39 UTC 2019 - John Vandenberg + +- Add pr_2.patch to fix tests to use sys.executable + ------------------------------------------------------------------- Wed Feb 6 21:45:56 UTC 2019 - Jan Engelhardt diff --git a/python-tabulate.spec b/python-tabulate.spec index 8386ff0..1b65abf 100644 --- a/python-tabulate.spec +++ b/python-tabulate.spec @@ -25,6 +25,8 @@ License: MIT Group: Development/Languages/Python URL: https://bitbucket.org/astanin/python-tabulate Source: https://files.pythonhosted.org/packages/source/t/tabulate/tabulate-%{version}.tar.gz +# https://github.com/astanin/python-tabulate/pull/2 +Patch0: pr_2.patch BuildRequires: %{python_module nose} BuildRequires: %{python_module pandas} BuildRequires: %{python_module setuptools} @@ -51,7 +53,8 @@ The main use cases of the library are: decimal point %prep -%autosetup -n tabulate-%{version} +%setup -n tabulate-%{version} +%patch0 -p1 %build %python_build