From 25ef5e068d3fa258a09b4be367ef21000199390210a8cd59c85b2d9808242b0a Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 29 Dec 2021 00:38:25 +0000
Subject: [PATCH] Accepting request 942797 from home:bnavigator:py310

- Update to 5.3.0
  * Support for Python 3.10 in testing (#238)
  * Add support for Python 3.10
  * Update copyright to 2022
  * Bump version to 5.3.0
  * Add Python 3.10 to the README
- Avoid django test collections errors on python 3.6:#
  no python36-Django 4
- Keep ignoring djangocache tests due to
  gh#grantjenks/python-diskcache#210

OBS-URL: https://build.opensuse.org/request/show/942797
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-diskcache?expand=0&rev=18
---
 diskcache-5.3.0.tar.gz   |  3 +++
 python-diskcache.changes | 14 ++++++++++++++
 python-diskcache.spec    | 23 ++++++++++++++---------
 v5.1.0.tar.gz            |  3 ---
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 diskcache-5.3.0.tar.gz
 delete mode 100644 v5.1.0.tar.gz

diff --git a/diskcache-5.3.0.tar.gz b/diskcache-5.3.0.tar.gz
new file mode 100644
index 0000000..a510a76
--- /dev/null
+++ b/diskcache-5.3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54d56f96a011f1914434cd59c3e90c5318a19ab36a295e8c2d6cb51145c10857
+size 653506
diff --git a/python-diskcache.changes b/python-diskcache.changes
index 5a0134d..752564a 100644
--- a/python-diskcache.changes
+++ b/python-diskcache.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Dec 27 13:20:49 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to 5.3.0
+  * Support for Python 3.10 in testing (#238)
+  * Add support for Python 3.10
+  * Update copyright to 2022
+  * Bump version to 5.3.0
+  * Add Python 3.10 to the README
+- Avoid django test collections errors on python 3.6:#
+  no python36-Django 4
+- Keep ignoring djangocache tests due to
+  gh#grantjenks/python-diskcache#210
+
 -------------------------------------------------------------------
 Tue Nov 17 05:43:53 UTC 2020 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/python-diskcache.spec b/python-diskcache.spec
index 26b7974..8953fcf 100644
--- a/python-diskcache.spec
+++ b/python-diskcache.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-diskcache
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,19 +19,20 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global skip_python2 1
 Name:           python-diskcache
-Version:        5.1.0
+Version:        5.3.0
 Release:        0
 Summary:        Disk and file backed cache
 License:        Apache-2.0
 URL:            http://www.grantjenks.com/docs/diskcache/
-Source:         https://github.com/grantjenks/python-diskcache/archive/v%{version}.tar.gz
-BuildRequires:  %{python_module Django}
-BuildRequires:  %{python_module mock}
+Source:         https://github.com/grantjenks/python-diskcache/archive/v%{version}.tar.gz#/diskcache-%{version}.tar.gz
+BuildRequires:  %{python_module pytest-xdist}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{pythons}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module Django if (%python-base without python36-base)}
+BuildRequires:  %{python_module pytest-django if (%python-base without python36-base)}
 Requires:       python
 BuildArch:      noarch
 %python_subpackages
@@ -44,6 +45,7 @@ in pure Python, and compatible with Django.
 
 %prep
 %setup -q
+sed -i '/--cov/d' tox.ini
 
 %build
 %python_build
@@ -53,13 +55,16 @@ in pure Python, and compatible with Django.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-sed -i '/-n auto/d' tox.ini
-rm tests/test_djangocache.py
-%pytest
+# No python36-Django 4 on TW
+python36_flags=("--ignore" "tests/test_doctest.py" "-k" "not README.rst")
+# Broken since Django 3.2 -- https://github.com/grantjenks/python-diskcache/issues/210
+donttest_djangocache="--ignore tests/test_djangocache.py"
+%pytest "${$python_flags[@]}" ${donttest_djangocache}
 
 %files %{python_files}
 %license LICENSE
 %doc README.rst
-%{python_sitelib}/*
+%{python_sitelib}/diskcache
+%{python_sitelib}/diskcache-%{version}*-info
 
 %changelog
diff --git a/v5.1.0.tar.gz b/v5.1.0.tar.gz
deleted file mode 100644
index 3580157..0000000
--- a/v5.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5c7e86f82cc199cd0a8ccbe3e20309f3505710ed7bdc1a4b2c021dfbe19a9f9
-size 656930