From c49c2fa23d1a848d76753656601dbffc54db7e63cc5a8eb2265a3a0199c2e05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 5 Mar 2019 14:33:48 +0000 Subject: [PATCH] - Update to 18.1.0: * too many changes to iterate, see CHANGES.rst * Dropped support for python2 - Make sure tests are run OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-CherryPy?expand=0&rev=23 --- CherryPy-10.2.1.tar.gz | 3 -- CherryPy-18.1.0.tar.gz | 3 ++ python-CherryPy.changes | 8 +++++ python-CherryPy.spec | 71 +++++++++++++++++------------------------ 4 files changed, 40 insertions(+), 45 deletions(-) delete mode 100644 CherryPy-10.2.1.tar.gz create mode 100644 CherryPy-18.1.0.tar.gz diff --git a/CherryPy-10.2.1.tar.gz b/CherryPy-10.2.1.tar.gz deleted file mode 100644 index 07d63d1..0000000 --- a/CherryPy-10.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ee7e514de0167b63233a6bba25dda2bb9d5ef800da8ea3a0282a9a57a382274 -size 688216 diff --git a/CherryPy-18.1.0.tar.gz b/CherryPy-18.1.0.tar.gz new file mode 100644 index 0000000..7be60d0 --- /dev/null +++ b/CherryPy-18.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615 +size 682792 diff --git a/python-CherryPy.changes b/python-CherryPy.changes index 5aae0cc..dbec2eb 100644 --- a/python-CherryPy.changes +++ b/python-CherryPy.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 5 12:19:29 UTC 2019 - Tomáš Chvátal + +- Update to 18.1.0: + * too many changes to iterate, see CHANGES.rst + * Dropped support for python2 +- Make sure tests are run + ------------------------------------------------------------------- Fri Feb 9 14:23:16 UTC 2018 - normand@linux.vnet.ibm.com diff --git a/python-CherryPy.spec b/python-CherryPy.spec index f47ac59..a9c72b5 100644 --- a/python-CherryPy.spec +++ b/python-CherryPy.spec @@ -1,7 +1,7 @@ # # spec file for package python-CherryPy # -# 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 @@ -12,57 +12,46 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# transient tests failures for PowerPC and x86_64 -%bcond_with tests - -%bcond_without python2 - +%define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python Name: python-CherryPy -Version: 10.2.1 +Version: 18.1.0 Release: 0 -Url: http://www.cherrypy.org Summary: Object-Oriented HTTP framework License: BSD-3-Clause Group: Development/Languages/Python +URL: http://www.cherrypy.org Source: https://files.pythonhosted.org/packages/source/C/CherryPy/CherryPy-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} BuildRequires: fdupes -# SECTION test requirements -BuildRequires: %{python_module cheroot >= 5.2.0} -BuildRequires: %{python_module nose} -BuildRequires: %{python_module portend >= 1.6.1} -BuildRequires: %{python_module pytest-runner} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module six} -%if %{with python2} -BuildRequires: python2-backports.unittest_mock -%endif -# /SECTION BuildRequires: python-rpm-macros +Requires: python-cheroot >= 6.2.4 +Requires: python-more-itertools +Requires: python-portend >= 2.1.1 +Requires: python-zc.lockfile Requires(post): update-alternatives Requires(postun): update-alternatives -Requires: python-cheroot >= 5.2.0 -Requires: python-portend >= 1.6.1 -Requires: python-six -Recommends: python-simplejson -Recommends: python-Routes -Recommends: python-pyOpenSSL -Recommends: python-memcached >= 1.58 +Recommends: python-Routes >= 2.3.1 Recommends: python-flup +Recommends: python-memcached >= 1.58 +Recommends: python-pyOpenSSL +Recommends: python-simplejson BuildArch: noarch -%ifpython2 -Provides: %{oldpython}-cherrypy = %{version} -Obsoletes: %{oldpython}-cherrypy < %{version} -%endif - +# SECTION test requirements +BuildRequires: %{python_module cheroot >= 6.2.4} +BuildRequires: %{python_module more-itertools} +BuildRequires: %{python_module path.py} +BuildRequires: %{python_module portend >= 2.1.1} +BuildRequires: %{python_module pytest-services} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module requests-toolbelt} +BuildRequires: %{python_module zc.lockfile} +# /SECTION %python_subpackages %description @@ -80,21 +69,19 @@ Oh, and most importantly: CherryPy is fun to work with :-) %prep %setup -q -n CherryPy-%{version} +# do not require cov/xdist/etc +sed -i -e '/addopts/d' pytest.ini %build %python_build %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/cherryd -%fdupes %{buildroot}%{_prefix} %check -%if %{with tests} -%python_exec -m pytest cherrypy/test -%else -echo "transient test failures so disable pytest." -%endif +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v %post %python_install_alternative cherryd @@ -103,8 +90,8 @@ echo "transient test failures so disable pytest." %python_uninstall_alternative cherryd %files %{python_files} -%defattr(-,root,root,-) -%doc README.rst LICENSE.md CHANGES.rst +%license LICENSE.md +%doc README.rst CHANGES.rst %python_alternative %{_bindir}/cherryd %{python_sitelib}/cherrypy/ %{python_sitelib}/CherryPy-%{version}-py%{python_version}.egg-info