Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-django-eremaea2 for
openSUSE:Factory checked in at 2023-04-28 16:24:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-eremaea2 (Old)
and /work/SRC/openSUSE:Factory/.python-django-eremaea2.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-eremaea2"
Fri Apr 28 16:24:52 2023 rev:5 rq:1083514 version:2.0.17
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-eremaea2/python-django-eremaea2.changes
2022-03-29 18:15:43.919151479 +0200
+++
/work/SRC/openSUSE:Factory/.python-django-eremaea2.new.1533/python-django-eremaea2.changes
2023-04-28 16:26:02.074943986 +0200
@@ -1,0 +2,8 @@
+Fri Apr 28 09:01:06 UTC 2023 - [email protected]
+
+- do not require python-six
+- added patches
+ fix https://github.com/matwey/django-eremaea2/issues/14
+ + python-django-eremaea2-no-six.patch
+
+-------------------------------------------------------------------
New:
----
python-django-eremaea2-no-six.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-eremaea2.spec ++++++
--- /var/tmp/diff_new_pack.syGNmR/_old 2023-04-28 16:26:03.534952508 +0200
+++ /var/tmp/diff_new_pack.syGNmR/_new 2023-04-28 16:26:03.542952555 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-django-eremaea2
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
#
-%{?!pythons:%define pythons %{?!skip_python2:python2}
%{?!skip_python3:python3}}
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-django-eremaea2
Version: 2.0.17
@@ -26,6 +24,8 @@
License: BSD-2-Clause
URL: https://github.com/matwey/django-eremaea2
Source:
https://files.pythonhosted.org/packages/source/d/django-eremaea2/django-eremaea2-%{version}.tar.gz
+# https://github.com/matwey/django-eremaea2/issues/14
+Patch0: python-django-eremaea2-no-six.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: %{python_module Django >= 1.10}
@@ -34,12 +34,13 @@
BuildRequires: %{python_module django-dj-inmemorystorage}
BuildRequires: %{python_module djangorestframework >= 3.7.0}
BuildRequires: %{python_module pytest-django}
+# https://github.com/matwey/django-eremaea2/issues/15
BuildRequires: %{python_module python-magic}
BuildRequires: %{python_module requests-mock}
+# https://github.com/matwey/django-eremaea2/issues/15
BuildRequires: %{python_module requests-toolbelt}
BuildRequires: %{python_module requests}
BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module six}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: eremaea = %{version}
@@ -49,7 +50,6 @@
Requires: python-magic
Requires: python-requests
Requires: python-requests-toolbelt
-Requires: python-six
Requires(post): update-alternatives
Requires(postun):update-alternatives
%python_subpackages
@@ -68,7 +68,7 @@
This package contains the systemd unit files for python-django-eremaea2.
%prep
-%setup -q -n django-eremaea2-%{version}
+%autosetup -p1 -n django-eremaea2-%{version}
%build
%python_build
@@ -116,7 +116,7 @@
%doc README.md
%license LICENSE
%python_alternative %{_bindir}/eremaeactl
-%{python_sitelib}/*
+%{python_sitelib}/*eremaea*
%files -n eremaea
%defattr(-,root,root,-)
++++++ python-django-eremaea2-no-six.patch ++++++
Index: django-eremaea2-2.0.17/eremaea/ctl/file.py
===================================================================
--- django-eremaea2-2.0.17.orig/eremaea/ctl/file.py
+++ django-eremaea2-2.0.17/eremaea/ctl/file.py
@@ -1,6 +1,5 @@
from collections import namedtuple
-from six import Iterator
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
import os.path
import mimetypes
import requests
@@ -9,7 +8,7 @@ from requests_toolbelt.auth.guess import
File = namedtuple("File", ("name", "mimetype", "content"))
-class Stream(Iterator):
+class Stream:
def __init__(self, url):
self._url = url
@@ -21,7 +20,7 @@ class Stream(Iterator):
class LocalFileStream(Stream):
def __init__(self, url):
- super(LocalFileStream, self).__init__(url)
+ super().__init__(url)
def __next__(self):
with open(self._url, "rb") as f:
@@ -31,7 +30,7 @@ class LocalFileStream(Stream):
class HTTPFileStream(Stream):
def __init__(self, url):
- super(HTTPFileStream, self).__init__(url)
+ super().__init__(url)
parsed_url = urlparse(url)
Index: django-eremaea2-2.0.17/tests/collection.py
===================================================================
--- django-eremaea2-2.0.17.orig/tests/collection.py
+++ django-eremaea2-2.0.17/tests/collection.py
@@ -7,7 +7,7 @@ from rest_framework import status
from rest_framework.test import APIClient
from eremaea import models
from datetime import timedelta
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
class CollectionTest(TestCase):
def setUp(self):
Index: django-eremaea2-2.0.17/tests/snapshot.py
===================================================================
--- django-eremaea2-2.0.17.orig/tests/snapshot.py
+++ django-eremaea2-2.0.17/tests/snapshot.py
@@ -7,7 +7,7 @@ from mimetypes import guess_all_extensio
from os.path import splitext
from eremaea import models
from datetime import timedelta
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
class SnapshotTest(TestCase):
def setUp(self):
@@ -132,7 +132,7 @@ class SnapshotTest(TestCase):
url = reverse('snapshot-detail', args=[snapshot.id])
response = self.client.get(url)
link_hdr = response['Link']
- self.assertEqual(link_hdr, '{0};
rel=alternate'.format(response.data['file']))
+ self.assertEqual(link_hdr, '{};
rel=alternate'.format(response.data['file']))
def test_snapshot_head1(self):
file = ContentFile(b"123")
file.name = "file.jpg"
