From cd770d1ad42ff06669b83daab692aa23ce8e5a9d50bb338642fc692db28a4a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 16 Aug 2020 08:14:35 +0000
Subject: [PATCH] Accepting request 826680 from
 home:jayvdb:branches:devel:languages:python

- Add LICENSE
- Remove unnecessary %bcond_without test
- Add testing under pytest

OBS-URL: https://build.opensuse.org/request/show/826680
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exam?expand=0&rev=7
---
 LICENSE             |  7 +++++++
 python-exam.changes |  7 +++++++
 python-exam.spec    | 11 +++++------
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..5be27de
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,7 @@
+Copyright © 2012 Jeff Pollard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/python-exam.changes b/python-exam.changes
index 887c6c8..2b33561 100644
--- a/python-exam.changes
+++ b/python-exam.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 14 13:06:42 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
+
+- Add LICENSE
+- Remove unnecessary %bcond_without test
+- Add testing under pytest
+
 -------------------------------------------------------------------
 Thu Mar 26 10:32:50 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
 
diff --git a/python-exam.spec b/python-exam.spec
index 46dd1e6..4e9072b 100644
--- a/python-exam.spec
+++ b/python-exam.spec
@@ -17,7 +17,6 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without test
 Name:           python-exam
 Version:        0.10.6
 Release:        0
@@ -26,13 +25,13 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/fluxx/exam
 Source:         https://files.pythonhosted.org/packages/source/e/exam/exam-%{version}.tar.gz
+Source1:        https://raw.githubusercontent.com/Fluxx/exam/master/LICENSE
 # https://github.com/Fluxx/exam/pull/50
 Patch0:         remove_nose.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
-%if %{with test}
 BuildRequires:  %{python_module mock}
-%endif
+BuildRequires:  %{python_module pytest}
 BuildRequires:  fdupes
 %ifpython2
 Requires:       python-mock
@@ -52,6 +51,7 @@ conventions and adhering to the unit testing interface.
 %prep
 %setup -q -n exam-%{version}
 %patch0 -p1
+cp %{SOURCE1} .
 
 %build
 %python_build
@@ -60,14 +60,13 @@ conventions and adhering to the unit testing interface.
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%if %{with test}
 %check
 %python_exec -m unittest discover -s tests/ -v
-%endif
+%pytest
 
 %files %{python_files}
-%defattr(-,root,root,-)
 %doc README.rst
+%license LICENSE
 %{python_sitelib}/*
 
 %changelog