1
0

Accepting request 760434 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/760434
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-CacheControl?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2020-01-03 16:36:41 +00:00 committed by Git OBS Bridge
commit bac775b395
5 changed files with 21 additions and 52 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3876bbd614968e0d82c95734b380fca648661416fb14dc1a50514256e521089
size 37981

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ec120838f445bff473cd8b8206ddae3650679142976927179743fabb876f3e3
size 38346

View File

@ -1,41 +0,0 @@
From 2b886af2a3d0271bf5598ba3917e39395bb8f4b5 Mon Sep 17 00:00:00 2001
From: TheJokr <leo@dashsec.com>
Date: Fri, 25 Jan 2019 21:53:53 +0100
Subject: [PATCH] Removed cherrypy.server from pytest namespace
pytest_namespace was removed in pytest version 4.0.
The fixture now points directly to cherrypy.server.
---
tests/conftest.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tests/conftest.py b/tests/conftest.py
index f9701cf..c581c0d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -107,7 +107,7 @@ def __call__(self, env, start_response):
@pytest.fixture(scope="session")
def server():
- return pytest.server
+ return cherrypy.server
@pytest.fixture()
@@ -124,7 +124,7 @@ def get_free_port():
return ip, port
-def pytest_namespace():
+def pytest_configure(config):
cherrypy.tree.graft(SimpleApp(), "/")
ip, port = get_free_port()
@@ -136,7 +136,6 @@ def pytest_namespace():
logger.removeHandler(logger.handlers[0])
cherrypy.server.start()
- return {"server": cherrypy.server}
def pytest_unconfigure(config):

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jan 2 11:57:41 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
- Drop merged pytest4.patch
- Add explanation of one test failure
- Remove mention of httplib2 from package summary
- Update to v0.12.6
* Test if cache is None before falling back to DictCache
* Fixed body in 304 response to etag request
* Added check for "*" value in Vary header
* Make v4 cache compatible with msgpack 1.0 in the future
-------------------------------------------------------------------
Fri Nov 1 09:31:12 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package python-CacheControl
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 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
@ -18,14 +18,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-CacheControl
Version: 0.12.5
Version: 0.12.6
Release: 0
Summary: httplib2 caching for requests
Summary: Caching library for Python requests
License: Apache-2.0
Group: Development/Languages/Python
URL: https://github.com/ionrock/cachecontrol
Source: https://github.com/ionrock/cachecontrol/archive/v0.12.5.tar.gz#/CacheControl-%{version}.tar.gz
Patch0: pytest4.patch
Source: https://github.com/ionrock/cachecontrol/archive/v%{version}.tar.gz#/CacheControl-%{version}.tar.gz
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@ -52,7 +51,6 @@ requests session object.
%prep
%setup -q -n cachecontrol-%{version}
%patch0 -p1
%build
%python_build
@ -62,8 +60,8 @@ requests session object.
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
# These two failures are possibly bugs needing investigation
PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_bin_suffix} -v -k 'not test_file_cache_recognizes_consumed_file_handle and not test_etags_get_example'
# test_file_cache_recognizes_consumed_file_handle uses httpbin.org directly
PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_bin_suffix} -v -k 'not test_file_cache_recognizes_consumed_file_handle'
%files %{python_files}
%license LICENSE.txt