From 90e579fcb8d583cb80e4ba877e0016a0cf760887d4c4674b69e3eca85c74041a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 28 Apr 2020 09:12:25 +0000 Subject: [PATCH 1/2] - Add patch to build with django 3.x: * django3.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-djet?expand=0&rev=5 --- django3.patch | 24 ++++++++++++++++++++++++ python-djet.changes | 6 ++++++ python-djet.spec | 4 +++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 django3.patch diff --git a/django3.patch b/django3.patch new file mode 100644 index 0000000..0c7da3a --- /dev/null +++ b/django3.patch @@ -0,0 +1,24 @@ +From 973325c14324c00d47f7c128f1c5c5e1233f3d59 Mon Sep 17 00:00:00 2001 +From: maurepass +Date: Thu, 6 Feb 2020 04:34:23 +0100 +Subject: [PATCH] changed the source of importing 'six' library + +--- + djet/files.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/djet/files.py b/djet/files.py +index d5eb2ea..7b6cc92 100644 +--- a/djet/files.py ++++ b/djet/files.py +@@ -1,8 +1,9 @@ + import os + import datetime ++ ++import six + from django.core.files.storage import Storage, default_storage + from django.core.files.uploadedfile import InMemoryUploadedFile +-from django.utils import six + + + class InMemoryStorage(Storage): diff --git a/python-djet.changes b/python-djet.changes index acc837f..d3d00b8 100644 --- a/python-djet.changes +++ b/python-djet.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 28 09:08:52 UTC 2020 - Tomáš Chvátal + +- Add patch to build with django 3.x: + * django3.patch + ------------------------------------------------------------------- Mon Oct 7 13:13:53 UTC 2019 - Tomáš Chvátal diff --git a/python-djet.spec b/python-djet.spec index f5356f8..a686f29 100644 --- a/python-djet.spec +++ b/python-djet.spec @@ -1,7 +1,7 @@ # # spec file for package python-djet # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Summary: Set of helpers for easy testing of Django apps License: MIT URL: https://github.com/sunscrapers/djet Source: https://github.com/sunscrapers/djet/archive/%{version}.tar.gz#/djet-%{version}.tar.gz +Patch0: django3.patch BuildRequires: %{python_module Django} BuildRequires: %{python_module Pillow} BuildRequires: %{python_module djangorestframework} @@ -43,6 +44,7 @@ Set of helpers for easy testing of Django apps. %prep %setup -q -n djet-%{version} +%patch0 -p1 %build %python_build From cb0398a9ab079fe689e8da9f28785f4756079a97996f29d8e9290f80d5f5c872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 28 Apr 2020 09:13:15 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-djet?expand=0&rev=6 --- python-djet.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-djet.spec b/python-djet.spec index a686f29..7de983c 100644 --- a/python-djet.spec +++ b/python-djet.spec @@ -31,10 +31,12 @@ BuildRequires: %{python_module Pillow} BuildRequires: %{python_module djangorestframework} BuildRequires: %{python_module pytest-django} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Django Requires: python-Pillow +Requires: python-six Suggests: python-djangorestframework BuildArch: noarch %python_subpackages