From 47f4aa4eccf92f762606721551c9a73241eaaa91d98b0bc90b85d76fec533354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Feb 2019 08:18:01 +0000 Subject: [PATCH 1/4] Accepting request 673188 from home:jayvdb:branches:devel:languages:python - Add missing dependencies pytz and dbm - Activate tests, currently broken - Fix %license OBS-URL: https://build.opensuse.org/request/show/673188 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testrepository?expand=0&rev=37 --- python-testrepository.changes | 7 +++++++ python-testrepository.spec | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/python-testrepository.changes b/python-testrepository.changes index a4eb561..f05e16b 100644 --- a/python-testrepository.changes +++ b/python-testrepository.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 11 04:14:13 UTC 2019 - John Vandenberg + +- Add missing dependencies pytz and dbm +- Activate tests, currently broken +- Fix %license + ------------------------------------------------------------------- Tue Dec 4 12:55:12 UTC 2018 - Matej Cepl diff --git a/python-testrepository.spec b/python-testrepository.spec index 04ce483..2e9bb15 100644 --- a/python-testrepository.spec +++ b/python-testrepository.spec @@ -1,7 +1,7 @@ # # spec file for package python-testrepository # -# 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 @@ -25,16 +25,19 @@ License: BSD-3-Clause OR Apache-2.0 Group: Development/Languages/Python URL: https://launchpad.net/testrepository Source: https://files.pythonhosted.org/packages/source/t/testrepository/testrepository-%{version}.tar.gz +BuildRequires: %{python_module dbm} BuildRequires: %{python_module extras} BuildRequires: %{python_module fixtures} BuildRequires: %{python_module pbr} BuildRequires: %{python_module python-mimeparse} BuildRequires: %{python_module python-subunit} +BuildRequires: %{python_module pytz} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module testresources} BuildRequires: %{python_module testscenarios} BuildRequires: %{python_module testtools} BuildRequires: python-rpm-macros +Requires: python-dbm Requires: python-extras Requires: python-fixtures Requires: python-python-subunit >= 0.0.10 @@ -70,6 +73,9 @@ subunit or be converted into a subunit stream can be accepted). %python_install %python_clone -a %{buildroot}%{_bindir}/testr +%check +%python_exec setup.py test + %post %python_install_alternative testr @@ -77,8 +83,8 @@ subunit or be converted into a subunit stream can be accepted). %python_uninstall_alternative testr %files %{python_files} -%license COPYING -%doc Apache-2.0 NEWS README.txt BSD +%license COPYING Apache-2.0 BSD +%doc NEWS README.txt %python_alternative %{_bindir}/testr %{python_sitelib}/* From 66881e7b7388260ea0031625d81acd3264f7b37480655217e2a33e40f61ba0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Feb 2019 11:36:35 +0000 Subject: [PATCH 2/4] - Fix the buildrequires to match up properly OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testrepository?expand=0&rev=38 --- python-testrepository.changes | 5 +++++ python-testrepository.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/python-testrepository.changes b/python-testrepository.changes index f05e16b..e5d7097 100644 --- a/python-testrepository.changes +++ b/python-testrepository.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 11 11:36:20 UTC 2019 - Tomáš Chvátal + +- Fix the buildrequires to match up properly + ------------------------------------------------------------------- Mon Feb 11 04:14:13 UTC 2019 - John Vandenberg diff --git a/python-testrepository.spec b/python-testrepository.spec index 2e9bb15..6679361 100644 --- a/python-testrepository.spec +++ b/python-testrepository.spec @@ -23,9 +23,8 @@ Release: 0 Summary: A repository of test results License: BSD-3-Clause OR Apache-2.0 Group: Development/Languages/Python -URL: https://launchpad.net/testrepository +URL: https://github.com/testing-cabal/testrepository Source: https://files.pythonhosted.org/packages/source/t/testrepository/testrepository-%{version}.tar.gz -BuildRequires: %{python_module dbm} BuildRequires: %{python_module extras} BuildRequires: %{python_module fixtures} BuildRequires: %{python_module pbr} @@ -37,6 +36,7 @@ BuildRequires: %{python_module testresources} BuildRequires: %{python_module testscenarios} BuildRequires: %{python_module testtools} BuildRequires: python-rpm-macros +BuildRequires: python3-dbm Requires: python-dbm Requires: python-extras Requires: python-fixtures @@ -47,7 +47,7 @@ Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch %ifpython3 -Requires: python3-dbm +Requires: python-dbm %endif %python_subpackages From bfd18575ef168b15cc4ba9c095e230cd0ed5737f94a07f65625f53c5b5259bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 26 Mar 2019 10:43:36 +0000 Subject: [PATCH 3/4] - The tests are failing in the release but work on the git so lets hope there is some release in future that will allow us to enable them OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testrepository?expand=0&rev=39 --- python-testrepository.changes | 7 +++++++ python-testrepository.spec | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/python-testrepository.changes b/python-testrepository.changes index e5d7097..e8a5e45 100644 --- a/python-testrepository.changes +++ b/python-testrepository.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 26 10:41:33 UTC 2019 - Tomáš Chvátal + +- The tests are failing in the release but work on the git + so lets hope there is some release in future that will allow + us to enable them + ------------------------------------------------------------------- Mon Feb 11 11:36:20 UTC 2019 - Tomáš Chvátal diff --git a/python-testrepository.spec b/python-testrepository.spec index 6679361..671adc9 100644 --- a/python-testrepository.spec +++ b/python-testrepository.spec @@ -35,6 +35,7 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module testresources} BuildRequires: %{python_module testscenarios} BuildRequires: %{python_module testtools} +BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-dbm Requires: python-dbm @@ -71,10 +72,17 @@ subunit or be converted into a subunit stream can be accepted). %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/testr %check -%python_exec setup.py test +#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 +#$python ./testr init +#$python ./testr run --parallel +#} %post %python_install_alternative testr From 8a6349e7e7f6f8d1b0d14ba08d5b86764b93aacd1ac49800270117ce5ef39087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 26 Mar 2019 16:00:18 +0000 Subject: [PATCH 4/4] - Remove accidental runtime dep on python-dbm OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testrepository?expand=0&rev=40 --- python-testrepository.changes | 5 +++++ python-testrepository.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/python-testrepository.changes b/python-testrepository.changes index e8a5e45..5db58e1 100644 --- a/python-testrepository.changes +++ b/python-testrepository.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 26 16:00:06 UTC 2019 - Tomáš Chvátal + +- Remove accidental runtime dep on python-dbm + ------------------------------------------------------------------- Tue Mar 26 10:41:33 UTC 2019 - Tomáš Chvátal diff --git a/python-testrepository.spec b/python-testrepository.spec index 671adc9..fc676e3 100644 --- a/python-testrepository.spec +++ b/python-testrepository.spec @@ -38,7 +38,6 @@ BuildRequires: %{python_module testtools} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-dbm -Requires: python-dbm Requires: python-extras Requires: python-fixtures Requires: python-python-subunit >= 0.0.10