Accepting request 743993 from devel:languages:python

- Do not pull in setuptools dependency at all to avoid cycles

OBS-URL: https://build.opensuse.org/request/show/743993
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pyparsing?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2019-11-04 16:11:02 +00:00 committed by Git OBS Bridge
commit 75ee93418d
2 changed files with 11 additions and 14 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 16 14:22:35 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Do not pull in setuptools dependency at all to avoid cycles
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 6 05:01:32 UTC 2019 - Thomas Bechtold <tbechtold@suse.com> Tue Aug 6 05:01:32 UTC 2019 - Thomas Bechtold <tbechtold@suse.com>

View File

@ -32,26 +32,15 @@ Version: 2.4.2
Release: 0 Release: 0
Summary: Grammar Parser Library for Python Summary: Grammar Parser Library for Python
License: MIT AND GPL-2.0-or-later AND GPL-3.0-or-later License: MIT AND GPL-2.0-or-later AND GPL-3.0-or-later
Group: Development/Languages/Python
URL: https://github.com/pyparsing/pyparsing/ URL: https://github.com/pyparsing/pyparsing/
# Upstream tarball from the master branch with gh#pyparsing/pyparsing#47
Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz
# Source: pyparsing-%{version}.tar.xz
BuildRequires: %{python_module base} BuildRequires: %{python_module base}
BuildRequires: %{python_module setuptools}
%if "%{flavor}" == "test"
# Not necessary for python3, but tests fail with the standard unittest
# and python 2.7
BuildRequires: %{python_module unittest2}
%endif
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
#!BuildIgnore: python2-pyparsing
#!BuildIgnore: python3-pyparsing
# do not add dependencies on setuptools and ideally not even full "python";
# this is now a dependency of setuptools
Requires: python-base
BuildArch: noarch BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module unittest2}
%endif
%ifpython2 %ifpython2
Provides: %{oldpython}-parsing = %{version} Provides: %{oldpython}-parsing = %{version}
Obsoletes: %{oldpython}-parsing < %{version} Obsoletes: %{oldpython}-parsing < %{version}
@ -66,6 +55,9 @@ code uses to construct the grammar directly in Python code.
%prep %prep
%setup -q -n %{modname}-%{version} %setup -q -n %{modname}-%{version}
# do not require setuptools
# https://github.com/pyparsing/pyparsing/pull/133
sed -i -e 's:from setuptools :from distutils.core :g' setup.py
%build %build
%python_build %python_build