Hello community, here is the log from the commit of package python-apipkg for openSUSE:Factory checked in at 2020-12-12 20:29:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-apipkg (Old) and /work/SRC/openSUSE:Factory/.python-apipkg.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-apipkg" Sat Dec 12 20:29:14 2020 rev:7 rq:854121 version:1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-apipkg/python-apipkg.changes 2019-07-30 13:01:18.838438439 +0200 +++ /work/SRC/openSUSE:Factory/.python-apipkg.new.2328/python-apipkg.changes 2020-12-12 20:31:33.493801576 +0100 @@ -1,0 +2,12 @@ +Tue Dec 8 10:59:41 UTC 2020 - Benjamin Greiner <[email protected]> + +- The now broken apicycle requires apipkg to be importable from + elsewhere -- use src dir. + +------------------------------------------------------------------- +Sun Dec 6 11:49:49 UTC 2020 - Matej Cepl <[email protected]> + +- Split package into multibuild, to avoid apipkg -> pytest -> py -> + apipkg cycle. + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-apipkg.spec ++++++ --- /var/tmp/diff_new_pack.NIdHd8/_old 2020-12-12 20:31:34.017802122 +0100 +++ /var/tmp/diff_new_pack.NIdHd8/_new 2020-12-12 20:31:34.021802126 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-apipkg +# spec file for package python # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-apipkg +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -%{flavor} +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +Name: python-apipkg%{psuffix} Version: 1.5 Release: 0 Summary: Namespace control and lazy-import mechanism @@ -25,8 +33,13 @@ Group: Development/Languages/Python URL: https://github.com/pytest-dev/apipkg/ Source: https://files.pythonhosted.org/packages/source/a/apipkg/apipkg-%{version}.tar.gz +# PATCH-FIX-UPSTREAM pytest4.patch bsc#[0-9]+ [email protected] +# Collected upstream fixes for gh#pytest-dev/apipkg#14 and +# gh#pytest-dev/apipkg#15 Patch0: pytest4.patch +%if %{with test} BuildRequires: %{python_module pytest} +%endif BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -46,24 +59,30 @@ can copy paste the <100 Lines of code into your project. %prep -%setup -q -n apipkg-%{version} -%patch0 -p1 +%autosetup -p1 -n apipkg-%{version} %build %python_build %install +%if ! %{with test} %python_install %python_expand %fdupes -s %{buildroot}%{$python_sitelib} +%endif %check -%python_expand PYTHONPATH="%{buildroot}%{$python_sitelib}" $python -m pytest +%if %{with test} +PYTHONPATH=$(pwd)/src +%pytest +%endif +%if ! %{with test} %files %{python_files} %license LICENSE %doc README.rst CHANGELOG %dir %{python_sitelib}/apipkg %{python_sitelib}/apipkg/* %{python_sitelib}/apipkg-%{version}-py%{python_version}.egg-info +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild> ++++++ pytest4.patch ++++++ --- /var/tmp/diff_new_pack.NIdHd8/_old 2020-12-12 20:31:34.053802160 +0100 +++ /var/tmp/diff_new_pack.NIdHd8/_new 2020-12-12 20:31:34.057802164 +0100 @@ -1,7 +1,5 @@ -Index: apipkg-1.5/test_apipkg.py -=================================================================== ---- apipkg-1.5.orig/test_apipkg.py -+++ apipkg-1.5/test_apipkg.py +--- a/test_apipkg.py ++++ b/test_apipkg.py @@ -13,7 +13,7 @@ ModuleType = types.ModuleType class TestRealModule: _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
