From 02d538706654a51a0a080692a04c3aaf61803454f03fff9fae3fbf2635b4d568 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 8 Nov 2018 17:22:24 +0000 Subject: [PATCH 01/10] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=19 --- python-requests-mock.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/python-requests-mock.spec b/python-requests-mock.spec index ef38e2e..571fe2d 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without test Name: python-requests-mock -Version: 1.4.0 +Version: 1.5.2 Release: 0 Summary: Mock out responses from the requests package License: Apache-2.0 @@ -43,7 +43,6 @@ Requires: python-six BuildRequires: python3-dbm Requires: python3-dbm %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -74,8 +73,8 @@ testr run --parallel %endif %files %{python_files} -%defattr(-,root,root,-) -%doc AUTHORS README.rst LICENSE ChangeLog +%doc AUTHORS README.rst ChangeLog +%license LICENSE %{python_sitelib}/* %changelog From cf916c0d070eed7127442f5ef65fd1700d7b5cd8e1de9a69854083edc309bf73 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 8 Nov 2018 17:22:47 +0000 Subject: [PATCH 02/10] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=20 --- requests-mock-1.5.2.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 requests-mock-1.5.2.tar.gz diff --git a/requests-mock-1.5.2.tar.gz b/requests-mock-1.5.2.tar.gz new file mode 100644 index 0000000..2993f5e --- /dev/null +++ b/requests-mock-1.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb +size 47581 From 51faf978e8823ba58e17e57bf9568516aacb1337ac77a3a6928f4c3c6b778e2f Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 8 Nov 2018 17:23:27 +0000 Subject: [PATCH 03/10] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=21 --- requests-mock-1.4.0.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 requests-mock-1.4.0.tar.gz diff --git a/requests-mock-1.4.0.tar.gz b/requests-mock-1.4.0.tar.gz deleted file mode 100644 index 4d0993f..0000000 --- a/requests-mock-1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b -size 42169 From 3bb1ea93e74610143edbcd61936da3f557f8000ab7762bafe179266392bf2992 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 8 Nov 2018 17:24:40 +0000 Subject: [PATCH 04/10] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=22 --- python-requests-mock.spec | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/python-requests-mock.spec b/python-requests-mock.spec index 571fe2d..ae39ae0 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -17,7 +17,6 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without test Name: python-requests-mock Version: 1.5.2 Release: 0 @@ -61,16 +60,9 @@ You should checkout the docs for more information. %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib}/mymodule -%if %{with test} %check -mv .testr.conf .testr.conf.orig -%{python_expand # first line can't be empty -rm -rf .testrepository -sed 's/python/$python/' .testr.conf.orig >| .testr.conf -testr init -testr run --parallel -} -%endif +%python_expand pytest-%{$python_bin_suffix} tests/pytest +%python_exec setup.py testr %files %{python_files} %doc AUTHORS README.rst ChangeLog From 068f8f57e003091c69679b5d6f9706c53fa2d5ba17f7258cb48b2fc59f42ff56 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 8 Nov 2018 17:27:48 +0000 Subject: [PATCH 05/10] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=23 --- python-requests-mock.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-requests-mock.spec b/python-requests-mock.spec index ae39ae0..6a20cdc 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -31,11 +31,12 @@ BuildRequires: %{python_module fixtures} BuildRequires: %{python_module mock} BuildRequires: %{python_module pbr} BuildRequires: %{python_module requests} -BuildRequires: %{python_module rpm-macros} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module six} BuildRequires: %{python_module testrepository >= 0.0.18} BuildRequires: %{python_module testtools} BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-requests >= 1.1 Requires: python-six %ifpython3 From a66aa67629ac2ff970f481c8aeafe3cf2d95c47b3cb6df7da55ee583734aecba Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 8 Nov 2018 17:34:09 +0000 Subject: [PATCH 06/10] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=24 --- requests-mock-1.4.0.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 requests-mock-1.4.0.tar.gz diff --git a/requests-mock-1.4.0.tar.gz b/requests-mock-1.4.0.tar.gz new file mode 100644 index 0000000..4d0993f --- /dev/null +++ b/requests-mock-1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b +size 42169 From e49592d98d97ba54434d50cb9ff7f5290cb569b7b0363e822b7bb2dc8d426a76 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 8 Nov 2018 17:34:15 +0000 Subject: [PATCH 07/10] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=25 --- requests-mock-1.5.2.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 requests-mock-1.5.2.tar.gz diff --git a/requests-mock-1.5.2.tar.gz b/requests-mock-1.5.2.tar.gz deleted file mode 100644 index 2993f5e..0000000 --- a/requests-mock-1.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb -size 47581 From fa3140f8c1b1192fce9efe6828c0fa2bdb2ebff7139b175938e3b3f930214439 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 8 Nov 2018 17:34:22 +0000 Subject: [PATCH 08/10] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=26 --- python-requests-mock.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/python-requests-mock.spec b/python-requests-mock.spec index 6a20cdc..ef38e2e 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -17,8 +17,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without test Name: python-requests-mock -Version: 1.5.2 +Version: 1.4.0 Release: 0 Summary: Mock out responses from the requests package License: Apache-2.0 @@ -31,18 +32,18 @@ BuildRequires: %{python_module fixtures} BuildRequires: %{python_module mock} BuildRequires: %{python_module pbr} BuildRequires: %{python_module requests} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module rpm-macros} BuildRequires: %{python_module six} BuildRequires: %{python_module testrepository >= 0.0.18} BuildRequires: %{python_module testtools} BuildRequires: fdupes -BuildRequires: python-rpm-macros Requires: python-requests >= 1.1 Requires: python-six %ifpython3 BuildRequires: python3-dbm Requires: python3-dbm %endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -61,13 +62,20 @@ You should checkout the docs for more information. %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib}/mymodule +%if %{with test} %check -%python_expand pytest-%{$python_bin_suffix} tests/pytest -%python_exec setup.py testr +mv .testr.conf .testr.conf.orig +%{python_expand # first line can't be empty +rm -rf .testrepository +sed 's/python/$python/' .testr.conf.orig >| .testr.conf +testr init +testr run --parallel +} +%endif %files %{python_files} -%doc AUTHORS README.rst ChangeLog -%license LICENSE +%defattr(-,root,root,-) +%doc AUTHORS README.rst LICENSE ChangeLog %{python_sitelib}/* %changelog From a2780e4859f0146a11c5123f53c7ef343642c414d583816a310f040e456a50b3 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 13:59:54 +0000 Subject: [PATCH 09/10] Remove superfluous devel dependency for noarch package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=27 --- python-requests-mock.changes | 5 +++++ python-requests-mock.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python-requests-mock.changes b/python-requests-mock.changes index a9f4036..e66d08c 100644 --- a/python-requests-mock.changes +++ b/python-requests-mock.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 4 12:53:47 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + ------------------------------------------------------------------- Fri Feb 23 13:52:35 UTC 2018 - tbechtold@suse.com diff --git a/python-requests-mock.spec b/python-requests-mock.spec index ef38e2e..9ba85eb 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,7 +27,6 @@ Group: Development/Languages/Python Url: https://requests-mock.readthedocs.org/ Source: https://files.pythonhosted.org/packages/source/r/requests-mock/requests-mock-%{version}.tar.gz BuildRequires: %{python_module Sphinx >= 1.1.2} -BuildRequires: %{python_module devel} BuildRequires: %{python_module fixtures} BuildRequires: %{python_module mock} BuildRequires: %{python_module pbr} From c742703d5b303f6dcfabf4fca1aff44e14e222637eae9c1c9a724339fbbb9f25 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 17:21:24 +0000 Subject: [PATCH 10/10] Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=28 --- python-requests-mock.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/python-requests-mock.spec b/python-requests-mock.spec index 9ba85eb..c1cc9f3 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -24,7 +24,7 @@ Release: 0 Summary: Mock out responses from the requests package License: Apache-2.0 Group: Development/Languages/Python -Url: https://requests-mock.readthedocs.org/ +URL: https://requests-mock.readthedocs.org/ Source: https://files.pythonhosted.org/packages/source/r/requests-mock/requests-mock-%{version}.tar.gz BuildRequires: %{python_module Sphinx >= 1.1.2} BuildRequires: %{python_module fixtures} @@ -38,13 +38,11 @@ BuildRequires: %{python_module testtools} BuildRequires: fdupes Requires: python-requests >= 1.1 Requires: python-six +BuildArch: noarch %ifpython3 BuildRequires: python3-dbm Requires: python3-dbm %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - %python_subpackages %description @@ -73,8 +71,8 @@ testr run --parallel %endif %files %{python_files} -%defattr(-,root,root,-) -%doc AUTHORS README.rst LICENSE ChangeLog +%license LICENSE +%doc AUTHORS README.rst ChangeLog %{python_sitelib}/* %changelog