From f7d89fe371fe84c05d47a5c3d0a5b434d2f3370fd7b57f6adff3613f4b6255d3 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 14 Nov 2020 11:24:31 +0000 Subject: [PATCH] Accepting request 848401 from home:benoit_monin:branches:devel:languages:python - update to version 0.12.19: bugfix release - add fix_cookie_test.patch: imported from upstream master branch - update the documentation pdf - remove the separate LICENSE file: now packaged in release - drop removing the executable bit from egg-info files: fixed - run the tests during build OBS-URL: https://build.opensuse.org/request/show/848401 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bottle?expand=0&rev=35 --- LICENSE | 19 ------------------- bottle-0.12.18.tar.gz | 3 --- bottle-0.12.19.tar.gz | 3 +++ bottle-docs.pdf | 4 ++-- fix_cookie_test.patch | 11 +++++++++++ python-bottle.changes | 13 +++++++++++++ python-bottle.spec | 13 ++++++++----- 7 files changed, 37 insertions(+), 29 deletions(-) delete mode 100644 LICENSE delete mode 100644 bottle-0.12.18.tar.gz create mode 100644 bottle-0.12.19.tar.gz create mode 100644 fix_cookie_test.patch diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 162245d..0000000 --- a/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2012, Marcel Hellkamp. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/bottle-0.12.18.tar.gz b/bottle-0.12.18.tar.gz deleted file mode 100644 index a269c38..0000000 --- a/bottle-0.12.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0819b74b145a7def225c0e83b16a4d5711fde751cd92bae467a69efce720f69e -size 71557 diff --git a/bottle-0.12.19.tar.gz b/bottle-0.12.19.tar.gz new file mode 100644 index 0000000..1064e5d --- /dev/null +++ b/bottle-0.12.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c +size 73142 diff --git a/bottle-docs.pdf b/bottle-docs.pdf index 3a056c2..2211334 100644 --- a/bottle-docs.pdf +++ b/bottle-docs.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffb46ffb2590738db12a2cdf0900df7af76d15886f33e4a46c25063c39e0bf2e -size 464808 +oid sha256:c3a0899043e075ae4bb6543b7f7fe6a5c232b25d119f6e9700e617928ed5e8b0 +size 464804 diff --git a/fix_cookie_test.patch b/fix_cookie_test.patch new file mode 100644 index 0000000..8f617cb --- /dev/null +++ b/fix_cookie_test.patch @@ -0,0 +1,11 @@ +--- bottle-0.12.19.orig/test/test_environ.py ++++ bottle-0.12.19/test/test_environ.py +@@ -624,7 +624,7 @@ class TestResponse(unittest.TestCase): + response.delete_cookie('name') + cookies = [value for name, value in response.headerlist + if name.title() == 'Set-Cookie'] +- self.assertTrue('name=;' in cookies[0]) ++ self.assertTrue('Max-Age=-1' in cookies[0]) + + def test_set_header(self): + response = BaseResponse() diff --git a/python-bottle.changes b/python-bottle.changes index b33eef0..ca529f3 100644 --- a/python-bottle.changes +++ b/python-bottle.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Nov 13 17:49:59 UTC 2020 - Benoît Monin + +- update to version 0.12.19: bugfix release + * Do not split query strings on `;` anymore. + * Fix the Allow: header value in 405 "Method not allowed." + response. +- add fix_cookie_test.patch: imported from upstream master branch +- update the documentation pdf +- remove the separate LICENSE file: now packaged in release +- drop removing the executable bit from egg-info files: fixed +- run the tests during build + ------------------------------------------------------------------- Tue Apr 14 11:52:22 UTC 2020 - Matej Cepl diff --git a/python-bottle.spec b/python-bottle.spec index aece78b..067c999 100644 --- a/python-bottle.spec +++ b/python-bottle.spec @@ -18,14 +18,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-bottle -Version: 0.12.18 +Version: 0.12.19 Release: 0 Summary: WSGI framework for small web applications License: MIT URL: https://bottlepy.org/ Source: https://files.pythonhosted.org/packages/source/b/bottle/bottle-%{version}.tar.gz Source1: http://bottlepy.org/docs/0.12/bottle-docs.pdf -Source2: https://raw.githubusercontent.com/bottlepy/bottle/release-0.12/LICENSE +# partial import of upstream commit 8342490 +Patch0: fix_cookie_test.patch BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros BuildArch: noarch @@ -55,10 +56,9 @@ This subpackage contains the PDF documentation for %{name}. %prep %setup -q -n bottle-%{version} -cp %{SOURCE1} %{SOURCE2} . +%autopatch -p1 -# remove executable bit, those are not scripts -chmod -x bottle.egg-info/* +cp %{SOURCE1} . %build %python_build @@ -67,6 +67,9 @@ chmod -x bottle.egg-info/* %python_install %python_clone -a %{buildroot}%{_bindir}/bottle.py +%check +%python_exec test/testall.py + %post %python_install_alternative bottle.py