Accepting request 1290787 from devel:languages:python

- disable django support on SLE15 also

  * Fix peek when value is so large that a file is used
  * Support pathlib.Path as directory argument

OBS-URL: https://build.opensuse.org/request/show/1290787
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-diskcache?expand=0&rev=15

python-diskcache.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Jul  5 14:53:34 UTC 2025 - Dirk Müller <dmueller@suse.com>
+
+- disable django support on SLE15 also
+
+-------------------------------------------------------------------
+Thu Jun  5 06:01:37 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Switch to pyproject macros.
+
+-------------------------------------------------------------------
+Tue Oct  1 10:19:39 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Make Django build-requirement conditional and disable by default for
+  SUSE:SLFO:Main, bsc#1231124
+
 -------------------------------------------------------------------
 Wed Sep 27 12:15:19 UTC 2023 - ecsos <ecsos@opensuse.org>
 

python-diskcache.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-diskcache
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,13 @@
 #
 
 
+%if 0%{?suse_version} == 1600 || 0%{?suse_version} == 1500
+# No django in SLFO:Main or SLE15
+%bcond_with django
+%else
+%bcond_without django
+%endif
+
 %{?sle15_python_module_pythons}
 Name:           python-diskcache
 Version:        5.6.3
@@ -24,14 +31,18 @@ Summary:        Disk and file backed cache
 License:        Apache-2.0
 URL:            https://grantjenks.com/docs/diskcache/
 Source:         https://github.com/grantjenks/python-diskcache/archive/v%{version}.tar.gz#/diskcache-%{version}.tar.gz
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest-xdist}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 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)}
+%if %{with django}
+BuildRequires:  %{python_module Django}
+BuildRequires:  %{python_module pytest-django}
+%endif
 Requires:       python
 BuildArch:      noarch
 %python_subpackages
@@ -47,18 +58,22 @@ in pure Python, and compatible with Django.
 sed -i '/--cov/d' tox.ini
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
+%if %{without django}
+python_flags=("--ignore" "tests/test_doctest.py" "-k" "not README.rst")
+%else
 # No python36-Django 4 on TW
 python36_flags=("--ignore" "tests/test_doctest.py" "-k" "not README.rst")
+%endif
 # 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}
+%pytest "${$python_flags[@]}" "${python_flags[@]}" ${donttest_djangocache}
 
 %files %{python_files}
 %license LICENSE