Hello community,
here is the log from the commit of package python-ordered-set for
openSUSE:Factory checked in at 2019-10-30 14:48:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ordered-set (Old)
and /work/SRC/openSUSE:Factory/.python-ordered-set.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ordered-set"
Wed Oct 30 14:48:23 2019 rev:3 rq:743991 version:3.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ordered-set/python-ordered-set.changes
2019-06-06 18:15:19.744721050 +0200
+++
/work/SRC/openSUSE:Factory/.python-ordered-set.new.2990/python-ordered-set.changes
2019-10-30 14:48:29.582225307 +0100
@@ -1,0 +2,6 @@
+Thu Oct 17 09:01:30 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Switch to multibuild and make sure we build without setuptools
+ in order to avoid buildcycle
+
+-------------------------------------------------------------------
New:
----
_multibuild
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ordered-set.spec ++++++
--- /var/tmp/diff_new_pack.kkCLel/_old 2019-10-30 14:48:31.614227467 +0100
+++ /var/tmp/diff_new_pack.kkCLel/_new 2019-10-30 14:48:31.618227472 +0100
@@ -20,19 +20,30 @@
%global short_name ordered-set
%global dir_name ordered_set
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
Name: python-%{short_name}
Version: 3.1.1
Release: 0
Summary: Custom MutableSet that remembers its order
License: MIT
-Group: Development/Libraries/Python
URL: https://github.com/LuminosoInsight/ordered-set
Source0:
https://pypi.python.org/packages/source/o/%{short_name}/%{short_name}-%{version}.tar.gz
-BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module setuptools}
+# this package is build dependency of setuptools
+BuildRequires: %{python_module base}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
+%if %{with test}
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module setuptools}
+%endif
%python_subpackages
%description
@@ -40,23 +51,35 @@
entry has an index that can be looked up.
%prep
-%autosetup -n %{short_name}-%{version} -p1
+%setup -q -n %{short_name}-%{version}
+# we are build dep of setuptools
+sed -i -e 's:from setuptools :from distutils.core :g' setup.py
%build
%python_build
%install
+%if !%{with test}
%python_install
+# ensure egg-info is a directory
+%{python_expand rm -rf %{buildroot}%{$python_sitelib}/*.egg-info
+cp -r ordered_set.egg-info
%{buildroot}%{$python_sitelib}/ordered_set-%{version}-py%{$python_version}.egg-info
+}
%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
%check
+%if %{with test}
%pytest test.py
+%endif
+%if !%{with test}
%files %{python_files}
%license MIT-LICENSE
%doc README.md
%{python_sitelib}/%{dir_name}-*
%{python_sitelib}/%{dir_name}.py*
%pycache_only %{python3_sitelib}/__pycache__/%{dir_name}.*
+%endif
%changelog
++++++ _multibuild ++++++
<multibuild>
<package>test</package>
</multibuild>
