From 4e7ef427691413652ea6910322c064a5736df26182ed16654978ee0265ee89f2 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 28 Apr 2021 07:51:06 +0000 Subject: [PATCH] - Add appease-django-320.patch: * Upstream patch to avoid a test failure with building with Django 3.2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testfixtures?expand=0&rev=36 --- appease-django-320.patch | 19 +++++++++++++++++++ python-testfixtures.changes | 5 +++-- python-testfixtures.spec | 6 ++++-- 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 appease-django-320.patch diff --git a/appease-django-320.patch b/appease-django-320.patch new file mode 100644 index 0000000..46b69fb --- /dev/null +++ b/appease-django-320.patch @@ -0,0 +1,19 @@ +From 52a14d92a122665b1a101e6398eca3982de01739 Mon Sep 17 00:00:00 2001 +From: Chris Withers +Date: Sat, 10 Apr 2021 19:42:20 +0100 +Subject: [PATCH] appease Django 3.2 + +--- + testfixtures/tests/test_django/settings.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/testfixtures/tests/test_django/settings.py b/testfixtures/tests/test_django/settings.py +index cf960d7..5173650 100644 +--- a/testfixtures/tests/test_django/settings.py ++++ b/testfixtures/tests/test_django/settings.py +@@ -6,3 +6,5 @@ + ] + + DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}} ++ ++DEFAULT_AUTO_FIELD='django.db.models.AutoField' diff --git a/python-testfixtures.changes b/python-testfixtures.changes index 085ea15..0cf246a 100644 --- a/python-testfixtures.changes +++ b/python-testfixtures.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Wed Apr 28 06:50:55 UTC 2021 - Steve Kowalik +Wed Apr 28 07:49:55 UTC 2021 - Steve Kowalik -- Skip a test that has some fundamental disagreements with Django 3.2. +- Add appease-django-320.patch: + * Upstream patch to avoid a test failure with building with Django 3.2 ------------------------------------------------------------------- Fri Dec 18 09:50:52 UTC 2020 - John Vandenberg diff --git a/python-testfixtures.spec b/python-testfixtures.spec index ea8a6eb..bd8cd9c 100644 --- a/python-testfixtures.spec +++ b/python-testfixtures.spec @@ -25,6 +25,8 @@ Summary: A collection of helpers and mock objects for unit tests and doc License: MIT URL: https://github.com/Simplistix/testfixtures Source: https://files.pythonhosted.org/packages/source/t/testfixtures/testfixtures-%{version}.tar.gz +# PATCH-FIX-UPSTREAM: gh#Simplistix/testfixtures/commit/52a14d92a122665b1a101e6398eca3982de01739 +Patch0: appease-django-320.patch BuildRequires: %{python_module Django} BuildRequires: %{python_module Twisted} BuildRequires: %{python_module pytest >= 3.6} @@ -57,6 +59,7 @@ their own library and give them some tests of their own! %prep %setup -q -n testfixtures-%{version} +%autopatch -p1 chmod a-x docs/*.txt %build @@ -70,8 +73,7 @@ chmod a-x docs/*.txt %check export DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings export PYTHONPATH=$(pwd) -# gh#Simplistix/testfixtures#156 -%pytest testfixtures/tests -k 'not test_manage' +%pytest testfixtures/tests %files %{python_files} %license LICENSE.txt