From dece3f99c114443712dd2555e9d2221fec997490 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Oct 06 2021 11:45:34 +0000 Subject: first build c9s --- diff --git a/.python-cherrypy.metadata b/.python-cherrypy.metadata index fb98218..52130df 100644 --- a/.python-cherrypy.metadata +++ b/.python-cherrypy.metadata @@ -1 +1 @@ -ad47d2d9c2c68231f0ea1b09ffb2927f42a493b6 SOURCES/CherryPy-3.2.2.tar.gz +b5ed09baf134deb3c0fe8254ff3f966bfc06399c SOURCES/CherryPy-18.6.1.tar.gz diff --git a/SPECS/python-cherrypy.spec b/SPECS/python-cherrypy.spec index 6491e49..54a7697 100644 --- a/SPECS/python-cherrypy.spec +++ b/SPECS/python-cherrypy.spec @@ -1,206 +1,224 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 +%{?python_enable_dependency_generator} + +%if 0%{?el8} + # jaraco.collections not yet available in epel8 + %bcond_with tests +%else + %bcond_without tests +%endif Name: python-cherrypy %global camelname CherryPy -Version: 8.9.1 -Release: 8%{?dist} +Version: 18.6.1 +Release: 1%{?dist} Summary: Pythonic, object-oriented web development framework License: BSD URL: http://www.cherrypy.org/ Source0: https://files.pythonhosted.org/packages/source/C/%{camelname}/%{camelname}-%{version}.tar.gz -BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-setuptools_scm -BuildRequires: dos2unix +# Ignore thread-related DeprecationWarnings new in Python 3.10 +# Temporary workaround for https://github.com/cherrypy/cherrypy/issues/1914 +Patch1: pytest-ignore-thread-DeprecationWarnings.patch -# Extras -Requires: python3-pyOpenSSL -Requires: python3-simplejson -# Keeping these two as 'Recommends' because the version requirements aren't yet -# currently satisfied in Fedora -Requires: python3-routes >= 2.3.1 -Requires: python3-memcached >= 1.58 +BuildArch: noarch +BuildRequires: dos2unix +BuildRequires: python3-devel +BuildRequires: python3dist(setuptools) +BuildRequires: python3dist(setuptools-scm) +%if %{with tests} # Test dependencies -BuildRequires: python3-mock -BuildRequires: python3-pytest -BuildRequires: python3-coverage -BuildRequires: python3-nose -BuildRequires: python3-nose-testconfig +BuildRequires: python3dist(cheroot) +BuildRequires: python3dist(jaraco.collections) +BuildRequires: python3dist(mock) +BuildRequires: python3dist(path.py) +BuildRequires: python3dist(portend) +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(pytest-cov) +BuildRequires: python3dist(requests-toolbelt) +BuildRequires: python3dist(more-itertools) +BuildRequires: python3dist(coverage) +BuildRequires: python3dist(pytest) +BuildRequires: python3-zc-lockfile +%endif %global _description\ -CherryPy allows developers to build web applications in much the same way\ +%{camelname} allows developers to build web applications in much the same way\ they would build any other object-oriented Python program. This usually\ results in smaller source code developed in less time. %description %_description -%package -n python3-cherrypy -Summary: %{summary} +%package -n python3-cherrypy +Summary: %summary %{?python_provide:%python_provide python3-cherrypy} -%description -n python3-cherrypy + +# Remove after F32. +Obsoletes: python2-cherrypy < 3.5.1 + +%description -n python3-cherrypy %_description %prep -%setup -q -n %{camelname}-%{version} +%autosetup -p1 -n %{camelname}-%{version} dos2unix cherrypy/tutorial/tutorial.conf +# These tests still fail (reason unknown): +rm cherrypy/test/test_session.py +rm cherrypy/test/test_static.py + %build %py3_build %install %py3_install -mv %{buildroot}%{_bindir}/cherryd %{buildroot}%{_bindir}/python%{python3_version}-cherryd -ln -s python%{python3_version}-cherryd %{buildroot}%{_bindir}/python3-cherryd - +%if %{with tests} %check -LANG=C.utf-8 %{__python3} -m pytest --ignore=build --ignore=cherrypy/test/test_static.py +# https://github.com/cherrypy/cherrypy/commit/5d3c86eb36dfdf972a1d3c8d69cf8be2050eb99c +export WEBTEST_INTERACTIVE=false +%pytest cherrypy/test \ + --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \ + -p no:unraisableexception +%endif %files -n python3-cherrypy -%license LICENSE.md %doc README.rst +%license LICENSE.md %doc cherrypy/tutorial -%{_bindir}/python3-cherryd -%{_bindir}/python%{python3_version}-cherryd +%{_bindir}/cherryd %{python3_sitelib}/* %exclude %{python3_sitelib}/cherrypy/cherryd %exclude %{python3_sitelib}/cherrypy/test %exclude %{python3_sitelib}/cherrypy/tutorial %changelog -* Mon Feb 10 2020 Giulio Fidente - 8.9.1-8 -- Skip test_null_bytes because python <= 3.7.6 +* Mon Aug 09 2021 Matthias Runge - 18.6.1-1 +- rebase to 18.6.1 (rhbz#1978987) -* Fri Mar 15 2019 Ken Dreyer - 8.9.1-7 -- rename source package to python-cherrypy +* Fri Jul 23 2021 Fedora Release Engineering - 18.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Sat Feb 02 2019 Fedora Release Engineering - 8.9.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Fri Jun 04 2021 Python Maint - 18.6.0-5 +- Rebuilt for Python 3.10 -* Sat Jul 14 2018 Fedora Release Engineering - 8.9.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Fri Jun 04 2021 Python Maint - 18.6.0-4 +- Bootstrap for Python 3.10 -* Tue Jun 19 2018 Miro Hrončok - 8.9.1-4 -- Rebuilt for Python 3.7 +* Wed May 26 2021 Miro Hrončok - 18.6.0-3 +- Fix/workaround build failures with pytest 6.2 and/or Python 3.10 -* Fri Feb 09 2018 Fedora Release Engineering - 8.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Wed Jan 27 2021 Fedora Release Engineering - 18.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Thu Jul 27 2017 Fedora Release Engineering - 8.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Mon Jan 25 2021 Ken Dreyer - 18.6.0-1 +- Update to 18.6.0 (rhbz#1777494) +- Re-enable tests on non-EPEL8 -* Wed Feb 22 2017 Tomas Orsava - 8.9.1-1 -- Updated to 8.9.1 to solve a FTBFS (#1424123) +* Wed Jul 29 2020 Fedora Release Engineering - 18.4.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Sat Feb 11 2017 Fedora Release Engineering - 8.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Sat Jun 20 2020 Miro Hrončok - 18.4.0-5 +- Disable unused automagic Python bytecompilation -* Sun Jan 01 2017 Miro Hrončok - 8.7.0-1 -- Updated to 8.7.0 (#1409339) +* Fri Jun 05 2020 Matthias Runge - 18.4.0-4 +- skip tests to fix FTBFS (rhbz#1810313) -* Wed Dec 28 2016 Miro Hrončok - 8.6.0-1 -- Updated to 8.6.0 (#1331982) -- Rebuild for Python 3.6 +* Tue May 26 2020 Miro Hrončok - 18.4.0-4 +- Rebuilt for Python 3.9 -* Tue Jul 19 2016 Fedora Release Engineering - 5.1.0-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages +* Sat Feb 15 2020 Elliott Sales de Andrade - 18.4.0-3 +- Fix Obsoletes for python2-cherrypy -* Wed Mar 16 2016 Tomas Orsava - 5.1.0-1 -- Updated to a new version -- Patched a build test error in said new version +* Thu Jan 30 2020 Fedora Release Engineering - 18.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Wed Mar 09 2016 Tomas Orsava - 5.0.1-2 -- Included a patch for the last issue when building against python 3.5 - (f24 or rawhide) based on an upstream commit: - https://bitbucket.org/cyraxjoe/cherrypy/commits/3c0983f310777933a687d265601981d05025ff2e +* Wed Nov 06 2019 Ken Dreyer - 18.4.0-1 +- Update to 18.4.0 (rhbz#1748716) +- Update comments about current test failures -* Thu Feb 25 2016 Tomas Orsava - 5.0.1-1 -- Updated to a new version -- Added one new build dependency -- Included a patch for the first of two test errors when building for rawhide - (caused by changes in python 3.5) based on an upstream pull request: - https://bitbucket.org/cherrypy/cherrypy/pull-requests/120/workaround-for-issue-1382-python-35 +* Thu Oct 03 2019 Miro Hrončok - 18.1.2-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) -* Thu Feb 04 2016 Fedora Release Engineering - 3.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Mon Aug 19 2019 Miro Hrončok - 18.1.2-4 +- Rebuilt for Python 3.8 -* Tue Nov 10 2015 Fedora Release Engineering - 3.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 +* Thu Aug 08 2019 Dan Radez - 18.1.2-3 +- Update to 18.1.2 +- Replaced Python2 package with Python 3 package +- python3-cherrypy-18.1.2-2 is already built by package python3-cherrypy + this release is to migrate python3-cherrypy into python-cherrypy -* Tue Jul 07 2015 Miro Hrončok - 3.8.0-1 -- Update to 3.8.0 (#1236248) +* Fri Jul 26 2019 Fedora Release Engineering - 3.5.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Thu Jun 18 2015 Fedora Release Engineering - 3.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Sat Feb 02 2019 Fedora Release Engineering - 3.5.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Sat Apr 25 2015 Fedora Release Monitoring - 3.7.0-1 -- Update to 3.7.0 (#1215290) +* Fri Jul 13 2018 Fedora Release Engineering - 3.5.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Fri Sep 26 2014 Miro Hrončok - 3.6.0-1 -- New version 3.6.0 (#1100749) -- Skip more tests :( +* Wed Feb 14 2018 Iryna Shcherbina - 3.5.0-9 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) -* Sun Jun 08 2014 Fedora Release Engineering - 3.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild +* Fri Feb 09 2018 Fedora Release Engineering - 3.5.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Fri May 16 2014 Matej Stuchlik - 3.2.6-1 -- Updated to 3.2.6 +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.5.0-7 +- Python 2 binary package renamed to python2-cherrypy + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 -* Fri May 02 2014 Miro Hrončok - 3.2.4-4 -- Rebuilt for Python 3.4 +* Thu Jul 27 2017 Fedora Release Engineering - 3.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Wed Nov 13 2013 Miro Hrončok - 3.2.4-3 -- Delete tutorial's __pycache__ after %%install AND after %%check +* Sat Feb 11 2017 Fedora Release Engineering - 3.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Tue Nov 12 2013 Miro Hrončok - 3.2.4-2 -- Use only %%{buildroot} and don't mix it with RPM_BUILD_ROOT +* Tue Jul 19 2016 Fedora Release Engineering - 3.5.0-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages -* Tue Nov 12 2013 Miro Hrončok - 3.2.4-1 -- Retaken orphaned package -- Update to 3.2.4 -- Remove some deprecated statements form the spec -- Remove some patches -- Refactor %%check -- Add license to %%doc and remove it form site-packages +* Thu Feb 04 2016 Fedora Release Engineering - 3.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Sun Aug 04 2013 Fedora Release Engineering - 3.2.0-0.rc1.r2567.1.8 +* Thu Jun 18 2015 Fedora Release Engineering - 3.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Aug 27 2014 Luke Macken - 3.5.0-1 +- Update to 3.5.0 (#1104560) + +* Sat Jun 07 2014 Fedora Release Engineering - 3.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 3.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Thu Feb 14 2013 Fedora Release Engineering - 3.2.0-0.rc1.r2567.1.7 +* Thu Feb 14 2013 Fedora Release Engineering - 3.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Sat Aug 04 2012 David Malcolm - 3.2.0-0.rc1.r2567.1.6 -- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 - -* Sat Jul 21 2012 Fedora Release Engineering - 3.2.0-0.rc1.r2567.1.5 +* Sat Jul 21 2012 Fedora Release Engineering - 3.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Sat Jan 14 2012 Fedora Release Engineering - 3.2.0-0.rc1.r2567.1.4 +* Sat Jan 14 2012 Fedora Release Engineering - 3.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Wed Feb 09 2011 Fedora Release Engineering - 3.2.0-0.rc1.r2567.1.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Thu Oct 27 2011 Conrad Meyer - 3.2.2-1 +- Update to 3.2.2 -* Wed Aug 25 2010 Thomas Spura - 3.2.0-0.rc1.r2567.1.2 -- rebuild with python3.2 - http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html +* Sat Jul 16 2011 Toshio Kuratomi - 3.2.1-1 +- Update to 3.2.1 -* Thu Jul 22 2010 David Malcolm - 3.2.0-0.rc1.r2567.1.1 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild +* Tue Feb 08 2011 Fedora Release Engineering - 3.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Mon Apr 19 2010 David Malcolm - 3.2.0-0.rc1.r2567.1 -- disable a test that hangs when run under Koji (patch 1) +* Wed Jul 21 2010 David Malcolm - 3.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild -* Mon Apr 5 2010 David Malcolm - 3.2.0-0.rc1.r2567 -- initial packaging for python 3, based on python-cherrypy-3.2.0-0.1.rc1.fc14 +* Mon May 31 2010 Toshio Kuratomi - 3.1.2-4 +- Fix a failing unittest with newer python -* Tue Feb 23 2010 Toshio Kuratomi - 3.2.0-0.1.rc1 -- New upstream release candidate +* Sat Apr 24 2010 Toshio Kuratomi - 3.1.2-3 +- Revert a try at 3.2.x-rc1 as the tests won't pass without some work. * Sun Jul 26 2009 Fedora Release Engineering - 3.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild