From 7dddb53d41f35e6c65901d54a82342f563569cba5659e6140d2408b0b4e290a2 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 4 Jan 2019 18:51:54 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testflo?expand=0&rev=9 --- python-testflo.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-testflo.spec b/python-testflo.spec index 3531bcb..34fabe4 100644 --- a/python-testflo.spec +++ b/python-testflo.spec @@ -33,6 +33,7 @@ BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros # SECTION test requirements +BuildRequires: %{python_module coverage} BuildRequires: %{python_module mpi4py} # /SECTION Requires: python-six From 8675ae77beb46751224b0c8f094d69bf6c76f5ab3ecf48705beee70373582d2f Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 4 Jan 2019 19:13:41 +0000 Subject: [PATCH 2/2] Accepting request 662893 from home:TheBlackCat:branches:devel:languages:python - Update to testflo version 1.3.4 * bug fix - Update to testflo version 1.3.3 * bug fix - Update to testflo version 1.3.2 * added support for ISOLATED attribute - Update to testflo version 1.3.1 Aug 17, 2018 * output from --pre_announce now looks better, with the result ('.', 'S', or 'F') showing on the same line as the "about to run ..." instead of on the following line * comments are now allowed inside of a test list file * added a --full_path option so that full testspec paths will be displayed. Having the full path make it easier to copy and paste the testspec to run testflo on just that single test. * updated the long_description in setup.py for pypi. OBS-URL: https://build.opensuse.org/request/show/662893 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testflo?expand=0&rev=10 --- LICENSE.txt | 13 ------------- python-testflo.changes | 18 ++++++++++++++++++ python-testflo.spec | 15 +++++++++------ testflo-1.2.tar.gz | 3 --- testflo-1.3.4.tar.gz | 3 +++ use_setuptools.patch | 23 +++++++++++++---------- 6 files changed, 43 insertions(+), 32 deletions(-) delete mode 100644 LICENSE.txt delete mode 100644 testflo-1.2.tar.gz create mode 100644 testflo-1.3.4.tar.gz diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index c3ae08e..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,13 +0,0 @@ -testflo Open Source License: - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/python-testflo.changes b/python-testflo.changes index 6a6c7b7..01672b5 100644 --- a/python-testflo.changes +++ b/python-testflo.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Jan 4 18:21:36 UTC 2019 - Todd R + +- Update to testflo version 1.3.4 + * bug fix +- Update to testflo version 1.3.3 + * bug fix +- Update to testflo version 1.3.2 + * added support for ISOLATED attribute +- Update to testflo version 1.3.1 +Aug 17, 2018 + * output from --pre_announce now looks better, with the result ('.', 'S', or 'F') showing on the same line as the + "about to run ..." instead of on the following line + * comments are now allowed inside of a test list file + * added a --full_path option so that full testspec paths will be displayed. Having the full path make it easier to + copy and paste the testspec to run testflo on just that single test. + * updated the long_description in setup.py for pypi. + ------------------------------------------------------------------- Tue Dec 4 12:55:10 UTC 2018 - Matej Cepl diff --git a/python-testflo.spec b/python-testflo.spec index 34fabe4..10decf2 100644 --- a/python-testflo.spec +++ b/python-testflo.spec @@ -1,7 +1,7 @@ # # spec file for package python-testflo # -# 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,14 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-testflo -Version: 1.2 +Version: 1.3.4 Release: 0 Summary: A flow-based testing framework License: Apache-2.0 Group: Development/Languages/Python Url: https://github.com/OpenMDAO/testflo Source: https://files.pythonhosted.org/packages/source/t/testflo/testflo-%{version}.tar.gz -Source10: https://raw.githubusercontent.com/OpenMDAO/testflo/%{version}/LICENSE.txt # PATCH-FIX-OPENSUSE use_setuptools.patch -- some of the optional features we want need setuptools Patch0: use_setuptools.patch BuildRequires: %{python_module setuptools} @@ -35,9 +34,12 @@ BuildRequires: python-rpm-macros # SECTION test requirements BuildRequires: %{python_module coverage} BuildRequires: %{python_module mpi4py} +BuildRequires: %{python_module psutil} # /SECTION Requires: python-six +Recommends: python-coverage Recommends: python-mpi4py +Recommends: python-psutil BuildArch: noarch Requires(post): update-alternatives Requires(preun): update-alternatives @@ -53,7 +55,6 @@ using unittest.TestCase objects that they are familiar with. %prep %setup -q -n testflo-%{version} -cp %{SOURCE10} . %patch0 -p1 %build @@ -64,8 +65,9 @@ cp %{SOURCE10} . %python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/testflo -%check -%python_expand $python -m unittest testflo.test +# Tests not included in sdists +# %%check +# %%python_expand $python -B -m unittest testflo.test %post %python_install_alternative testflo @@ -75,6 +77,7 @@ cp %{SOURCE10} . %files %{python_files} %license LICENSE.txt +%doc README.md RELEASE_NOTES.txt %python_alternative %{_bindir}/testflo %{python_sitelib}/* diff --git a/testflo-1.2.tar.gz b/testflo-1.2.tar.gz deleted file mode 100644 index 65e17f3..0000000 --- a/testflo-1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d35830cb4ec03cc02592ec2b259dd81f49a60380004e5312442e1c89378f74e -size 16116 diff --git a/testflo-1.3.4.tar.gz b/testflo-1.3.4.tar.gz new file mode 100644 index 0000000..b9cd898 --- /dev/null +++ b/testflo-1.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2572d26be18918a48e336f235885f29c6378963e2151f431e4325b09e132143f +size 21673 diff --git a/use_setuptools.patch b/use_setuptools.patch index 11ee9f2..861bf2b 100644 --- a/use_setuptools.patch +++ b/use_setuptools.patch @@ -1,17 +1,20 @@ -From: toddrme2178@gmail.com -Date: 2017-05-24 -Subject: use setuptools instead of distutils - -Some of the optional commands need setuptools. -In particular this is needed for the entrypoints. +From 31d00f83262e66298f759b8e2b45718cd534622c Mon Sep 17 00:00:00 2001 +From: Todd +Date: Fri, 4 Jan 2019 13:48:50 -0500 +Subject: [PATCH] Use setuptools +`entry_points` requires setuptools. It doesn't work with distutils. --- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 4a4f6fd..55cf9ba 100644 --- a/setup.py +++ b/setup.py -@@ -1,5 +1,5 @@ - +@@ -1,4 +1,4 @@ -from distutils.core import setup +from setuptools import setup - setup(name='testflo', - version='1.2', + import re +