SLFO-pool/python-diskcache
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main python-diskcache revision 71711856605fd6c55f694227cbd9da68

Browse Source
This commit is contained in:
Adrian Schröter 2024-10-11 10:07:32 +02:00
parent e4ddbeb7c2
commit 595ff52cb2
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python-diskcache.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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> Wed Sep 27 12:15:19 UTC 2023 - ecsos <ecsos@opensuse.org>

17
python-diskcache.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python-diskcache # spec file for package python-diskcache
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,6 +16,13 @@
# #
%if 0%{?suse_version} == 1600
# No django in SLFO:Main
%bcond_with django
%else
%bcond_without django
%endif
%{?sle15_python_module_pythons} %{?sle15_python_module_pythons}
Name: python-diskcache Name: python-diskcache
Version: 5.6.3 Version: 5.6.3
@ -30,8 +37,10 @@ BuildRequires: %{python_module setuptools}
BuildRequires: %{pythons} BuildRequires: %{pythons}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
%if %{with django}
BuildRequires: %{python_module Django if (%python-base without python36-base)} BuildRequires: %{python_module Django if (%python-base without python36-base)}
BuildRequires: %{python_module pytest-django if (%python-base without python36-base)} BuildRequires: %{python_module pytest-django if (%python-base without python36-base)}
%endif
Requires: python Requires: python
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages
@ -54,11 +63,15 @@ sed -i '/--cov/d' tox.ini
%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_expand %fdupes %{buildroot}%{$python_sitelib}
%check %check
%if %{without django}
python_flags=("--ignore" "tests/test_doctest.py" "-k" "not README.rst")
%else
# No python36-Django 4 on TW # No python36-Django 4 on TW
python36_flags=("--ignore" "tests/test_doctest.py" "-k" "not README.rst") 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 # Broken since Django 3.2 -- https://github.com/grantjenks/python-diskcache/issues/210
donttest_djangocache="--ignore tests/test_djangocache.py" donttest_djangocache="--ignore tests/test_djangocache.py"
%pytest "${$python_flags[@]}" ${donttest_djangocache} %pytest "${$python_flags[@]}" "${python_flags[@]}" ${donttest_djangocache}
%files %{python_files} %files %{python_files}
%license LICENSE %license LICENSE