Hello community,
here is the log from the commit of package python-CacheControl for
openSUSE:Factory checked in at 2019-11-01 15:14:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-CacheControl (Old)
and /work/SRC/openSUSE:Factory/.python-CacheControl.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-CacheControl"
Fri Nov 1 15:14:06 2019 rev:6 rq:744702 version:0.12.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-CacheControl/python-CacheControl.changes
2019-09-25 08:10:14.662535467 +0200
+++
/work/SRC/openSUSE:Factory/.python-CacheControl.new.2990/python-CacheControl.changes
2019-11-01 15:14:06.804753129 +0100
@@ -1,0 +2,6 @@
+Fri Nov 1 09:31:12 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Add patch to work with new pytest:
+ * pytest4.patch
+
+-------------------------------------------------------------------
New:
----
pytest4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-CacheControl.spec ++++++
--- /var/tmp/diff_new_pack.p0yfK0/_old 2019-11-01 15:14:07.512754052 +0100
+++ /var/tmp/diff_new_pack.p0yfK0/_new 2019-11-01 15:14:07.516754057 +0100
@@ -25,6 +25,7 @@
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
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -39,7 +40,7 @@
BuildRequires: python3-lockfile >= 0.9
BuildRequires: python3-mock
BuildRequires: python3-msgpack
-BuildRequires: python3-pytest < 4
+BuildRequires: python3-pytest
BuildRequires: python3-redis >= 2.10.5
BuildRequires: python3-requests
# /SECTION
@@ -51,6 +52,7 @@
%prep
%setup -q -n cachecontrol-%{version}
+%patch0 -p1
%build
%python_build
++++++ pytest4.patch ++++++
>From 2b886af2a3d0271bf5598ba3917e39395bb8f4b5 Mon Sep 17 00:00:00 2001
From: TheJokr <l...@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):
