From 171f53a7239251201e4c2fe242e9dffa43e7dcc9c46984c642fd51fb6f4f4029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 5 May 2020 14:29:49 +0000 Subject: [PATCH] Accepting request 800367 from home:mcalabkova:branches:devel:languages:python - Add patch fix-executable.patch to fix tests OBS-URL: https://build.opensuse.org/request/show/800367 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Fabric?expand=0&rev=63 --- fix-executable.patch | 11 +++++++++++ python-Fabric.changes | 5 +++++ python-Fabric.spec | 5 ++++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 fix-executable.patch diff --git a/fix-executable.patch b/fix-executable.patch new file mode 100644 index 0000000..fe17829 --- /dev/null +++ b/fix-executable.patch @@ -0,0 +1,11 @@ +Index: fabric-2.5.0/tests/main.py +=================================================================== +--- fabric-2.5.0.orig/tests/main.py ++++ fabric-2.5.0/tests/main.py +@@ -358,5 +358,5 @@ Fabric .+ + Paramiko .+ + Invoke .+ + """.strip() +- output = run("python -m fabric --version", hide=True, in_stream=False) ++ output = run(sys.executable + " -m fabric --version", hide=True, in_stream=False) + assert re.match(expected_output, output.stdout) diff --git a/python-Fabric.changes b/python-Fabric.changes index 1c5a92a..3969002 100644 --- a/python-Fabric.changes +++ b/python-Fabric.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 5 12:40:33 UTC 2020 - Marketa Calabkova + +- Add patch fix-executable.patch to fix tests + ------------------------------------------------------------------- Thu Sep 12 12:47:06 UTC 2019 - Tomáš Chvátal diff --git a/python-Fabric.spec b/python-Fabric.spec index ae0836e..4a43008 100644 --- a/python-Fabric.spec +++ b/python-Fabric.spec @@ -1,7 +1,7 @@ # # spec file for package python-Fabric # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ License: BSD-2-Clause Group: Development/Languages/Python URL: http://fabfile.org Source: https://files.pythonhosted.org/packages/source/f/fabric/fabric-%{version}.tar.gz +# fix executable in tests +Patch0: fix-executable.patch BuildRequires: %{python_module cryptography >= 1.1} BuildRequires: %{python_module decorator} BuildRequires: %{python_module invoke >= 1.3} @@ -68,6 +70,7 @@ Fabric itself leverages). %setup -q -n fabric-%{version} # fix all imports: sed -i 's/from invoke.vendor\./from\ /' fabric/connection.py fabric/group.py integration/concurrency.py tests/config.py tests/transfer.py tests/_util.py tests/connection.py tests/runners.py +%patch0 -p1 %build %python_build