Hello community, here is the log from the commit of package python-ruffus for openSUSE:Leap:15.2 checked in at 2020-03-02 13:22:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/python-ruffus (Old) and /work/SRC/openSUSE:Leap:15.2/.python-ruffus.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruffus" Mon Mar 2 13:22:24 2020 rev:3 rq:777110 version:2.8.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/python-ruffus/python-ruffus.changes 2020-01-15 15:52:45.931574593 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.python-ruffus.new.26092/python-ruffus.changes 2020-03-02 13:22:24.898285938 +0100 @@ -1,0 +2,19 @@ +Thu Jan 30 15:52:25 UTC 2020 - Todd R <[email protected]> + +- Tests require full python + +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Fri Aug 16 15:50:57 UTC 2019 - Todd R <[email protected]> + +- Update to 2.8.3 + * implement retry behaviour for file missing check + * Make doc/conf.py Python 3 compatible. + +------------------------------------------------------------------- Old: ---- ruffus-2.8.1.tar.gz New: ---- pr_114.patch ruffus-2.8.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ruffus.spec ++++++ --- /var/tmp/diff_new_pack.MeJPmn/_old 2020-03-02 13:22:26.502289128 +0100 +++ /var/tmp/diff_new_pack.MeJPmn/_new 2020-03-02 13:22:26.506289135 +0100 @@ -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 @@ -18,19 +18,22 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ruffus -Version: 2.8.1 +Version: 2.8.3 Release: 0 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 BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module pytest} +BuildRequires: %{pythons} # /SECTION %python_subpackages @@ -39,14 +42,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 +62,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 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.MeJPmn/_old 2020-03-02 13:22:26.526289175 +0100 +++ /var/tmp/diff_new_pack.MeJPmn/_new 2020-03-02 13:22:26.526289175 +0100 @@ -1,7 +1,7 @@ <constraints> <hardware> <memory> - <size unit="G">2</size> + <size unit="G">8</size> </memory> </hardware> </constraints> ++++++ 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, ++++++ ruffus-2.8.1.tar.gz -> ruffus-2.8.3.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/python-ruffus/ruffus-2.8.1.tar.gz /work/SRC/openSUSE:Leap:15.2/.python-ruffus.new.26092/ruffus-2.8.3.tar.gz differ: char 5, line 1
