From ee9eb2a2529f70361c6d5565b1f285a43082963128a63e7979549b389920d61b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 13 Aug 2018 13:19:04 +0000 Subject: [PATCH] Remove dependency on unittest2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyquery?expand=0&rev=25 --- pyquery-1.2.17.tar.gz | 3 --- pyquery-1.4.0.tar.gz | 3 +++ python-pyquery.changes | 5 +++++ python-pyquery.spec | 23 ++++++++++------------- 4 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 pyquery-1.2.17.tar.gz create mode 100644 pyquery-1.4.0.tar.gz diff --git a/pyquery-1.2.17.tar.gz b/pyquery-1.2.17.tar.gz deleted file mode 100644 index 11b701b..0000000 --- a/pyquery-1.2.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6aa0133b30d9a0229ad65d3a7708c4e853bf46808fb359d06ca56f5039102af6 -size 45949 diff --git a/pyquery-1.4.0.tar.gz b/pyquery-1.4.0.tar.gz new file mode 100644 index 0000000..1d655d8 --- /dev/null +++ b/pyquery-1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4771db76bd14352eba006463656aef990a0147a0eeaf094725097acfa90442bf +size 45215 diff --git a/python-pyquery.changes b/python-pyquery.changes index b185ea4..a56db66 100644 --- a/python-pyquery.changes +++ b/python-pyquery.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 13 13:18:38 UTC 2018 - mcepl@suse.com + +- Remove dependency on unittest2 + ------------------------------------------------------------------- Wed Mar 29 07:12:38 UTC 2017 - alarrosa@suse.com diff --git a/python-pyquery.spec b/python-pyquery.spec index 6fc056c..032ba24 100644 --- a/python-pyquery.spec +++ b/python-pyquery.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyquery # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,37 +16,34 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} # NOTE: circular dependency between python-pyquery and python-WebTest # enable testing with a build conditional (off by default): %bcond_with test - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyquery -Version: 1.2.17 +Version: 1.4.0 Release: 0 Summary: A jQuery-like library for python License: BSD-3-Clause Group: Development/Languages/Python -Url: http://pypi.python.org/pypi/pyquery +URL: http://pypi.python.org/pypi/pyquery Source: https://files.pythonhosted.org/packages/source/p/pyquery/pyquery-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module cssselect} BuildRequires: %{python_module devel} BuildRequires: %{python_module lxml >= 2.1} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +Requires: python-cssselect +Requires: python-lxml >= 2.1 +BuildArch: noarch %if %{with test} BuildRequires: %{python_module WebOb} BuildRequires: %{python_module WebTest} BuildRequires: %{python_module beautifulsoup} BuildRequires: %{python_module nose} BuildRequires: %{python_module restkit} -BuildRequires: %{python_module unittest2} %endif -BuildRequires: python-rpm-macros -Requires: python-cssselect -Requires: python-lxml >= 2.1 -BuildArch: noarch - %python_subpackages %description @@ -62,6 +59,7 @@ XML and HTML manipulation. %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %if %{with test} %check @@ -69,7 +67,6 @@ nosetests -q tests %endif %files %{python_files} -%defattr(-,root,root,-) %doc CHANGES.rst README.rst %{python_sitelib}/*