From 97fbddb27610e41efaf3aca04f783dff9645e529 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Dec 28 2016 20:55:49 +0000 Subject: Updated to 8.6.0 (#1331982) --- diff --git a/.gitignore b/.gitignore index bf6b399..e70acae 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /CherryPy-3.8.0.tar.gz /CherryPy-5.0.1.tar.gz /CherryPy-5.1.0.tar.gz +/CherryPy-8.6.0.tar.gz diff --git a/python-cherrypy-Fix-test_query_string_decoding-for-python3.patch b/python-cherrypy-Fix-test_query_string_decoding-for-python3.patch deleted file mode 100644 index d36f24c..0000000 --- a/python-cherrypy-Fix-test_query_string_decoding-for-python3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0a1d55bb6985195e97bb40f7b4090aa078b1310c Mon Sep 17 00:00:00 2001 -From: Joel Rivera -Date: Sat, 19 Mar 2016 14:21:46 -0600 -Subject: [PATCH] Fix test_query_string_decoding for python3 - ---- - cherrypy/test/test_encoding.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cherrypy/test/test_encoding.py b/cherrypy/test/test_encoding.py -index 85869a9..c6b4eb4 100644 ---- a/cherrypy/test/test_encoding.py -+++ b/cherrypy/test/test_encoding.py -@@ -3,7 +3,7 @@ import gzip - import cherrypy - from cherrypy._cpcompat import BytesIO, IncompleteRead, ntob, ntou - --europoundUnicode = ntou('\x80\xa3') -+europoundUnicode = ntou(r'\x00\xa3') - sing = ntou("\u6bdb\u6cfd\u4e1c: Sing, Little Birdie?", 'escape') - sing8 = sing.encode('utf-8') - sing16 = sing.encode('utf-16') --- -2.5.0 - diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch deleted file mode 100644 index d474ea8..0000000 --- a/python-cherrypy-tutorial-doc.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/setup.py b/setup.py -index 7d31bf8..cf70421 100644 ---- a/setup.py -+++ b/setup.py -@@ -74,7 +74,6 @@ url = "http://www.cherrypy.org" - cp_license = "BSD" - packages = [ - "cherrypy", "cherrypy.lib", -- "cherrypy.tutorial", "cherrypy.test", - "cherrypy.process", - "cherrypy.scaffold", - "cherrypy.wsgiserver", -@@ -90,19 +89,6 @@ data_files = [ - ]), - ('cherrypy/scaffold/static', [ - 'cherrypy/scaffold/static/made_with_cherrypy_small.png']), -- ('cherrypy/test', ['cherrypy/test/style.css', -- 'cherrypy/test/test.pem', -- ]), -- ('cherrypy/test/static', ['cherrypy/test/static/index.html', -- 'cherrypy/test/static/dirback.jpg', ]), -- ('cherrypy/tutorial', -- [ -- 'cherrypy/tutorial/tutorial.conf', -- 'cherrypy/tutorial/README.txt', -- 'cherrypy/tutorial/pdf_file.pdf', -- 'cherrypy/tutorial/custom_error.html', -- ] -- ), - ] - scripts = ["cherrypy/cherryd"] - diff --git a/python3-cherrypy.spec b/python3-cherrypy.spec index 2482b03..d3d23d5 100644 --- a/python3-cherrypy.spec +++ b/python3-cherrypy.spec @@ -1,28 +1,22 @@ Name: python3-cherrypy %global camelname CherryPy -Version: 5.1.0 -Release: 3%{?dist} +Version: 8.6.0 +Release: 1%{?dist} Summary: Pythonic, object-oriented web development framework Group: Development/Libraries License: BSD URL: http://www.cherrypy.org/ -Source0: https://pypi.python.org/packages/source/C/%{camelname}/%{camelname}-%{version}.tar.gz - -Patch0: python-cherrypy-tutorial-doc.patch -# Fixes a test failure in Python 3 -# https://bitbucket.org/cherrypy/cherrypy/issues/1409/cherrypy-510-build-fails-on-a-test -Patch1: python-cherrypy-Fix-test_query_string_decoding-for-python3.patch +Source0: https://files.pythonhosted.org/packages/source/C/%{camelname}/%{camelname}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-nose +BuildRequires: python3-pytest BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm BuildRequires: python3-mock BuildRequires: dos2unix -# Delete pycache in %%doc after %%install -%global __os_install_post %(echo '%{__os_install_post}'; echo 'rm -rf cherrypy/tutorial/__pycache__') - %description %{camelname} allows developers to build web applications in much the same way they would build any other object-oriented Python program. This usually @@ -30,48 +24,35 @@ results in smaller source code developed in less time. %prep %setup -q -n %{camelname}-%{version} -%patch0 -p1 -%patch1 -p1 -dos2unix README.txt cherrypy/LICENSE.txt cherrypy/tutorial/README.txt cherrypy/tutorial/tutorial.conf +dos2unix cherrypy/tutorial/tutorial.conf %build -%{__python3} setup.py build +%py3_build %install -%{__python3} setup.py install --skip-build --root %{buildroot} -mv %{buildroot}%{_bindir}/cherryd %{buildroot}%{_bindir}/python3-cherryd -rm -f %{buildroot}%{python3_sitelib}/cherrypy/LICENSE.txt -rm -f %{buildroot}%{python3_sitelib}/cherrypy/cherryd +%py3_install + +mv %{buildroot}%{_bindir}/cherryd %{buildroot}%{_bindir}/python%{python3_version}-cherryd +ln -s python%{python3_version}-cherryd %{buildroot}%{_bindir}/python3-cherryd %check -# This is cheating, we skip some tests -# The reason is, some of them are failing for dicts being unsorted in Py3 -# And some of them are just weird :D -# Some of them would hang mock -# Some import httplib -cd cherrypy/test -LANG=en_US.UTF-8 /usr/bin/nosetests-3* -v -s ./ -e 'test_SIGTERM' -e \ - 'test_SIGHUP_tty' -e 'test_file_stream' -e 'testCombinedTools' -e \ - 'test_HTTP11_pipelining' -e 'testCookies' -e 'testEncoding' -e \ - 'test_multipart_decoding' -e 'test_multipart_decoding_no_charset' -e \ - 'testErrorHandling' -e 'test_config_errors' -e 'testParams' -e \ - 'test_0_Session' -e 'test_conn' -e 'test_session' -e testTracebacks -cd - - -# The tests created __pycache__ in tutorial again, let's delete it -# But keep the deleting after %%install, if %%check is skipped -rm -rf cherrypy/tutorial/__pycache__ +LANG=C.utf-8 %{__python3} -m pytest --ignore=build %files -%license cherrypy/LICENSE.txt -%doc README.txt +%license LICENSE.md +%doc README.rst %doc cherrypy/tutorial %{_bindir}/python3-cherryd +%{_bindir}/python%{python3_version}-cherryd %{python3_sitelib}/* +%exclude %{python3_sitelib}/cherrypy/cherryd +%exclude %{python3_sitelib}/cherrypy/test +%exclude %{python3_sitelib}/cherrypy/tutorial %changelog -* Mon Dec 19 2016 Miro Hrončok - 5.1.0-3 +* Wed Dec 28 2016 Miro Hrončok - 8.6.0-1 +- Updated to 8.6.0 (#1331982) - Rebuild for Python 3.6 * Tue Jul 19 2016 Fedora Release Engineering - 5.1.0-2 diff --git a/sources b/sources index 4b1055d..cc133ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15e2ea13792fa2c165f18bf89396d64c CherryPy-5.1.0.tar.gz +SHA512 (CherryPy-8.6.0.tar.gz) = 46e67c154a2c5817ad3f5e1b25e8801acaaa4b2b3762d82f16e45f9293f46886c3cd353a664d864a250eb36fb075b7af2d33289713221ba515d27326df1bd918