Hello community, here is the log from the commit of package python-ruffus for openSUSE:Factory checked in at 2019-09-18 13:11:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ruffus (Old) and /work/SRC/openSUSE:Factory/.python-ruffus.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruffus" Wed Sep 18 13:11:00 2019 rev:3 rq:731169 version:2.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ruffus/python-ruffus.changes 2019-08-19 21:38:31.888341451 +0200 +++ /work/SRC/openSUSE:Factory/.python-ruffus.new.7948/python-ruffus.changes 2019-09-18 13:11:04.512694501 +0200 @@ -1,0 +2,7 @@ +Sat Sep 14 11:09:35 UTC 2019 - John Vandenberg <[email protected]> + +- Add pr_114.patch to use of python2 in tests with sys.executable +- Remove unnecessary *.cmd +- Replace outdated URL with GitHub + +------------------------------------------------------------------- New: ---- pr_114.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ruffus.spec ++++++ --- /var/tmp/diff_new_pack.TylFlT/_old 2019-09-18 13:11:05.120694374 +0200 +++ /var/tmp/diff_new_pack.TylFlT/_new 2019-09-18 13:11:05.124694373 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-ruffus # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,10 @@ Summary: Python computational pipeline management package License: MIT Group: Development/Languages/Python -URL: http://www.ruffus.org.uk +URL: https://github.com/cgat-developers/ruffus Source: https://files.pythonhosted.org/packages/source/r/ruffus/ruffus-%{version}.tar.gz +# https://github.com/cgat-developers/ruffus/pull/114 +Patch0: pr_114.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -39,14 +41,16 @@ %prep %setup -q -n ruffus-%{version} +%patch0 -p1 + +rm ruffus/test/*.cmd + sed -i -e '/^#!\//, 1d' ruffus/*.py sed -i -e '/^#! \//, 1d' ruffus/*.py sed -i -e '/^#!\//, 1d' ruffus/test/*.py sed -i -e '/^#! \//, 1d' ruffus/test/*.py -sed -i -e '/^#!\//, 1d' ruffus/test/*.cmd -sed -i -e '/^#! \//, 1d' ruffus/test/*.cmd + chmod a-x ruffus/*.py -chmod a-x ruffus/test/*.cmd chmod a-x ruffus/test/*.py %build @@ -57,9 +61,9 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check +export PYTHONDONTWRITEBYTECODE=1 pushd ruffus/test %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} -export PYTHONDONTWRITEBYTECODE=1 for f in test_*.py; do pytest-%{$python_bin_suffix} $f done ++++++ pr_114.patch ++++++ >From d153b8e349aecccca773819f554f6debc6253133 Mon Sep 17 00:00:00 2001 From: John Vandenberg <[email protected]> Date: Sat, 14 Sep 2019 18:05:17 +0700 Subject: [PATCH] test: Use sys.executable --- ruffus/test/test_drmaa_wrapper_run_job_locally.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruffus/test/test_drmaa_wrapper_run_job_locally.py b/ruffus/test/test_drmaa_wrapper_run_job_locally.py index becd33c..f247d7f 100755 --- a/ruffus/test/test_drmaa_wrapper_run_job_locally.py +++ b/ruffus/test/test_drmaa_wrapper_run_job_locally.py @@ -114,14 +114,14 @@ def test_run_job(self): environ = {"RUFFUS_HEEHEE": "what?"} home_dir = os.path.expanduser("~") sys.stderr.write(" Run echoing to screen...\n") - stdout, stderr = ruffus.drmaa_wrapper.run_job(cmd_str="python %s/slow_process_for_testing.py" % script_dir, + stdout, stderr = ruffus.drmaa_wrapper.run_job(cmd_str="%s %s/slow_process_for_testing.py" % (sys.executable, script_dir), job_environment=environ, working_directory=home_dir, run_locally=True, verbose=1, local_echo=True) sys.stderr.write(" Run silently...\n") - stdout, stderr = ruffus.drmaa_wrapper.run_job(cmd_str="python %s/slow_process_for_testing.py" % script_dir, + stdout, stderr = ruffus.drmaa_wrapper.run_job(cmd_str="%s %s/slow_process_for_testing.py" % (sys.executable, script_dir), job_environment=environ, working_directory=home_dir, run_locally=True,
